Enhance logging UI and increase Solr timeouts

Added clusterNode display to logging pages and model, and improved message/stack trace formatting for better readability. Increased Solr HTTP client timeouts to 60 seconds. Improved URI parameter handling and encoding in TurCommonsUtils.

Author: alegauss

turing-app/src/main/java/com/viglet/turing/solr/TurSolrConfiguration.java

@@ -45,8 +45,8 @@ public CloseableHttpClient closeableHttpClient() {
 		cm.setDefaultMaxPerRoute(10000);
 		cm.setValidateAfterInactivity(3000);
 
-		RequestConfig.Builder requestConfigBuilder = RequestConfig.custom().setConnectTimeout(30000)
-				.setSocketTimeout(30000);
+		RequestConfig.Builder requestConfigBuilder = RequestConfig.custom().setConnectTimeout(60000)
+				.setSocketTimeout(60000);
 
 		HttpClientBuilder httpClientBuilder = HttpClientBuilder.create().setKeepAliveStrategy((response, context) -> -1)
 				.evictIdleConnections(50000, TimeUnit.MILLISECONDS)

turing-commons/src/main/java/com/viglet/turing/commons/utils/TurCommonsUtils.java

@@ -83,20 +83,21 @@ public static boolean isValidUrl(URL url) {
             return false;
         }
     }
+
     public static String html2Text(String text) {
         return Jsoup.parse(text).text();
     }
 
     public static String text2Description(String text, int maxLength) {
-        if(text != null && text.length() > maxLength) {
+        if (text != null && text.length() > maxLength) {
             BreakIterator bi = BreakIterator.getWordInstance();
             bi.setText(text);
 
-            if(bi.isBoundary(maxLength-1)) {
-                return text.substring(0, maxLength-2) + " ...";
+            if (bi.isBoundary(maxLength - 1)) {
+                return text.substring(0, maxLength - 2) + " ...";
             } else {
-                int preceding = bi.preceding(maxLength-1);
-                return text.substring(0, preceding-1) + " ...";
+                int preceding = bi.preceding(maxLength - 1);
+                return text.substring(0, preceding - 1) + " ...";
             }
         } else {
             return text + " ...";
@@ -107,9 +108,10 @@ public static String html2Description(String text, int numberChars) {
         return text2Description(html2Text(text), numberChars);
     }
 
-    public static URI addOrReplaceParameter(URI uri, String paramName, Locale locale,  boolean decoded) {
-       return addOrReplaceParameter(uri, paramName, locale.toLanguageTag(), decoded);
+    public static URI addOrReplaceParameter(URI uri, String paramName, Locale locale, boolean decoded) {
+        return addOrReplaceParameter(uri, paramName, locale.toLanguageTag(), decoded);
     }
+
     public static URI addOrReplaceParameter(URI uri, String paramName, String paramValue, boolean decoded) {
         List<NameValuePair> params = new URIBuilder(uri, StandardCharsets.ISO_8859_1).getQueryParams();
         StringBuilder sbQueryString = new StringBuilder();
@@ -120,7 +122,7 @@ public static URI addOrReplaceParameter(URI uri, String paramName, String paramV
                 addParameterToQueryString(sbQueryString, nameValuePair.getName(), paramValue);
             } else {
                 addParameterToQueryString(sbQueryString, nameValuePair.getName(),
-                        decoded? URLDecoder.decode(nameValuePair.getValue(), StandardCharsets.UTF_8):
+                        decoded ? URLDecoder.decode(nameValuePair.getValue(), StandardCharsets.UTF_8) :
                                 nameValuePair.getValue());
             }
         }
@@ -139,7 +141,10 @@ public static void addParameterToQueryString(StringBuilder sbQueryString, String
 
     public static URI modifiedURI(URI uri, StringBuilder sbQueryString) {
         try {
-            return new URI(uri.getRawPath() + "?" + removeAmpersand(sbQueryString).replaceAll("[\\t\\n\\r]+","%20").replace(" ", "%20"));
+            return new URI(uri.getRawPath() + "?" + removeAmpersand(sbQueryString)
+                    .replaceAll("[\\t\\n\\r]+", "%20")
+                    .replace(" ", "%20")
+                    .replace("\"", "%22"));
         } catch (URISyntaxException e) {
             log.error(e.getMessage(), e);
         }

turing-ui/projects/console/src/logging/component/aem/logging-aem-page.component.html

@@ -5,18 +5,18 @@
         <div class="d-table-cell col-1" style="width: 200px;text-wrap: nowrap;">
           <div>{{ aem.date | amTimeAgo }}</div>
         </div>
+        <div class="d-table-cell col-1" style="width: 100px;">
+          <div>{{ aem.clusterNode }}</div>
+        </div>
         <div class="d-table-cell col-1" style="width: 100px;">
           <div>{{ aem.level }}</div>
         </div>
         <div class="d-table-cell col-3">
           <div style=" overflow-wrap: break-word;width: 300px;">{{ aem.logger }}</div>
         </div>
-        <div class="d-table-cell col-4">
-          <pre style="overflow-wrap: break-word;max-width: 200px">
-            {{ aem.message }}</pre>
-        </div>
-        <div class="d-table-cell col-3">
-          <pre style="overflow-wrap: break-word;max-width: 200px">
+        <div class="d-table-cell col-6">
+          <pre style="overflow-wrap: break-word;max-width: 600px">
+            {{ aem.message }}
             {{ aem.stackTrace }}</pre>
         </div>
       </div>

turing-ui/projects/console/src/logging/component/server/logging-server-page.component.html

@@ -5,18 +5,18 @@
         <div class="d-table-cell col-1" style="width: 200px;text-wrap: nowrap;">
           <div>{{ server.date | amTimeAgo }}</div>
         </div>
+        <div class="d-table-cell col-1" style="width: 100px;">
+          <div>{{ server.clusterNode }}</div>
+        </div>
         <div class="d-table-cell col-1" style="width: 100px;">
           <div>{{ server.level }}</div>
         </div>
         <div class="d-table-cell col-3">
           <div style=" overflow-wrap: break-word;width: 300px;">{{ server.logger }}</div>
         </div>
-        <div class="d-table-cell col-4">
-          <pre style="overflow-wrap: break-word;max-width: 200px">
-            {{ server.message }}</pre>
-        </div>
-        <div class="d-table-cell col-3">
-          <pre style="overflow-wrap: break-word;max-width: 200px">
+        <div class="d-table-cell col-6">
+          <pre style="overflow-wrap: break-word;max-width: 600px">
+            {{ server.message }}
             {{ server.stackTrace }}</pre>
         </div>
       </div>

turing-ui/projects/console/src/logging/model/logging-general.model.ts

@@ -1,5 +1,6 @@
 export class TurLoggingGeneral {
   date!: Date;
+  clusterNode!: string;
   level!: string;
   logger!: string;
   message!: string;