cleanup

Author: zeroleak

src/main/java/com/samourai/javaserver/utils/ServerUtils.java

@@ -1,6 +1,10 @@
 package com.samourai.javaserver.utils;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.lang.invoke.MethodHandles;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
@@ -11,6 +15,8 @@ public class ServerUtils {
   public static final String PROFILE_TEST = "test";
   public static final String PROFILE_DEFAULT = "default";
 
+  private static final ObjectMapper objectMapper = new ObjectMapper();
+
   private static ServerUtils instance;
 
   public static ServerUtils getInstance() {
@@ -30,4 +36,32 @@ public String obfuscateString(String str, int offset) {
     }
     return str.substring(0, offset) + "***" + str.substring(str.length() - offset, str.length());
   }
+
+  public String toJsonString(Object o) {
+    try {
+      return objectMapper.writeValueAsString(o);
+    } catch (Exception e) {
+      log.error("", e);
+    }
+    return null;
+  }
+
+  public Collection<Thread> getThreads() {
+    ThreadGroup tg = Thread.currentThread().getThreadGroup();
+    Collection<Thread> threads =
+        Thread.getAllStackTraces()
+            .keySet()
+            .stream()
+            .filter(
+                (t) -> {
+                  return t.getThreadGroup() == tg;
+                })
+            .sorted(
+                Comparator.comparing(
+                    (o) -> {
+                      return o.getName().toLowerCase();
+                    }))
+            .collect(Collectors.toList());
+    return threads;
+  }
 }

src/main/java/com/samourai/javaserver/web/models/ConfigTemplateModel.java

@@ -1,10 +1,14 @@
 package com.samourai.javaserver.web.models;
 
+import com.samourai.javaserver.utils.ServerUtils;
 import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.ui.Model;
 
 public class ConfigTemplateModel extends DashboardTemplateModel {
   public Map<String, String> configInfo;
+  @Autowired protected ServerProperties serverProperties;
 
   public ConfigTemplateModel(String pageTitle, String logoTitle, Map<String, String> configInfo) {
     super(pageTitle, logoTitle);
@@ -13,6 +17,7 @@ public ConfigTemplateModel(String pageTitle, String logoTitle, Map<String, Strin
 
   public void apply(Model model) {
     super.apply(model);
+    configInfo.put("serverProperties", ServerUtils.getInstance().toJsonString(serverProperties));
     model.addAttribute("configModel", this);
   }
 }

src/main/java/com/samourai/javaserver/web/models/SystemTemplateModel.java

@@ -1,27 +1,21 @@
 package com.samourai.javaserver.web.models;
 
+import com.samourai.javaserver.utils.ServerUtils;
 import java.util.Collection;
-import java.util.Comparator;
-import java.util.stream.Collectors;
+import java.util.Map;
 import org.springframework.ui.Model;
 
 public class SystemTemplateModel extends DashboardTemplateModel {
   public Collection<Thread> threads;
   public long memUsed;
   public long memTotal;
   public long startupTime;
+  public Map<String, String> metrics;
 
-  public SystemTemplateModel(String pageTitle, String logoTitle) {
+  public SystemTemplateModel(String pageTitle, String logoTitle, Map<String, String> metrics) {
     super(pageTitle, logoTitle);
 
-    ThreadGroup tg = Thread.currentThread().getThreadGroup();
-    this.threads =
-        Thread.getAllStackTraces()
-            .keySet()
-            .stream()
-            .filter(t -> t.getThreadGroup() == tg)
-            .sorted(Comparator.comparing(o -> o.getName().toLowerCase()))
-            .collect(Collectors.toList());
+    this.threads = ServerUtils.getInstance().getThreads();
     if (false) { // template usage
       Thread t = threads.iterator().next();
       t.getName();
@@ -34,6 +28,8 @@ public SystemTemplateModel(String pageTitle, String logoTitle) {
     long free = rt.freeMemory();
     memUsed = bytesToMB(total - free);
     memTotal = bytesToMB(total);
+
+    this.metrics = metrics;
   }
 
   public void setStartupTime(long startupTime) {

src/main/resources/templates/decorators/system.html

@@ -14,20 +14,31 @@ <h1 class="h2">System</h1>
 
         <div>Startup: <strong><span th:text="${#dates.format(systemModel.startupTime, 'dd-MMM-yyyy HH:mm:ss')}"/></strong></div>
         <div>Mem use: <strong><span th:text="${systemModel.memUsed}"/>M</strong>/<span th:text="${systemModel.memTotal}"/>M, <strong th:text="${systemModel.threads.size()}"/> threads running.</div>
+        <table class="table table-sm system">
+            <tr th:each="entry : *{systemModel.metrics}">
+                <div><span th:text="${entry.key}"/>: <strong th:text="${entry.value}"></strong></div>
+            </tr>
+        </table>
         <div class="table-responsive">
             <table class="table table-sm system">
                 <thead>
                 <tr>
                     <th scope="col"></th>
                     <th scope="col">Thread</th>
                     <th scope="col">Status</th>
+                    <th scope="col">Stacktrace</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr th:each="thread,iter : ${systemModel.threads}">
                     <td class="threadIndex"><span th:text="${iter.index+1}"/></td>
                     <td class="threadName"><span th:text="${thread.getName()}"/></td>
                     <td class="threadState"><span th:text="${thread.getState()}"/></td>
+                    <td class="threadStacktrace">
+                        <div th:each="line : ${thread.getStackTrace()}">
+                            <div th:text="${line.toString()}"/>
+                        </div>
+                    </td>
                 </tr>
                 </tbody>
             </table>