cleanup

zeroleak · zeroleak · commit 0526865e299a · 2020-02-18T15:33:41.000+01:00
diff --git a/src/main/java/com/samourai/javaserver/web/controllers/AbstractSystemWebController.java b/src/main/java/com/samourai/javaserver/web/controllers/AbstractSystemWebController.java
@@ -1,11 +1,15 @@
 package com.samourai.javaserver.web.controllers;
 
 import com.samourai.javaserver.web.models.SystemTemplateModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.ui.Model;
 
 public class AbstractSystemWebController {
+  @Autowired protected ApplicationContext applicationContext;
 
   public String system(Model model, SystemTemplateModel templateModel) {
+    templateModel.setStartupTime(applicationContext.getStartupDate());
     templateModel.apply(model);
     return "decorators/system.html";
   }
diff --git a/src/main/java/com/samourai/javaserver/web/models/ConfigTemplateModel.java b/src/main/java/com/samourai/javaserver/web/models/ConfigTemplateModel.java
@@ -13,6 +13,6 @@ public ConfigTemplateModel(String pageTitle, String logoTitle, Map<String, Strin
 
   public void apply(Model model) {
     super.apply(model);
-    model.addAttribute("configInfo", configInfo);
+    model.addAttribute("configModel", this);
   }
 }
diff --git a/src/main/java/com/samourai/javaserver/web/models/SystemTemplateModel.java b/src/main/java/com/samourai/javaserver/web/models/SystemTemplateModel.java
@@ -7,8 +7,9 @@
 
 public class SystemTemplateModel extends DashboardTemplateModel {
   public Collection<Thread> threads;
-  private long memUsed;
-  private long memTotal;
+  public long memUsed;
+  public long memTotal;
+  public long startupTime;
 
   public SystemTemplateModel(String pageTitle, String logoTitle) {
     super(pageTitle, logoTitle);
@@ -21,7 +22,7 @@ public SystemTemplateModel(String pageTitle, String logoTitle) {
             .filter(t -> t.getThreadGroup() == tg)
             .sorted(Comparator.comparing(o -> o.getName().toLowerCase()))
             .collect(Collectors.toList());
-    if (false) {
+    if (false) { // template usage
       Thread t = threads.iterator().next();
       t.getName();
       t.getState();
@@ -35,11 +36,13 @@ public SystemTemplateModel(String pageTitle, String logoTitle) {
     memTotal = bytesToMB(total);
   }
 
+  public void setStartupTime(long startupTime) {
+    this.startupTime = startupTime;
+  }
+
   public void apply(Model model) {
     super.apply(model);
-    model.addAttribute("threads", threads);
-    model.addAttribute("memUsed", memUsed);
-    model.addAttribute("memTotal", memTotal);
+    model.addAttribute("systemModel", this);
   }
 
   private static long bytesToMB(long bytes) {
diff --git a/src/main/resources/static/css/system.css b/src/main/resources/static/css/system.css
@@ -0,0 +1,4 @@
+td.threadIndex {
+    color:#ccc;
+    width:3em;
+}
diff --git a/src/main/resources/templates/decorators/config.html b/src/main/resources/templates/decorators/config.html
@@ -21,7 +21,7 @@ <h1 class="h2">Configuration</h1>
             </tr>
             </thead>
             <tbody>
-                <tr th:each="entry : *{configInfo}">
+                <tr th:each="entry : *{configModel.configInfo}">
                     <td class="configInfoKey"><span th:text="${entry.key}"/></td>
                     <td class="configInfoValue"><small th:text="${entry.value}"/></td>
                 </tr>
diff --git a/src/main/resources/templates/decorators/system.html b/src/main/resources/templates/decorators/system.html
@@ -6,23 +6,26 @@
       th:with="currentPage = 'system'">
 <head>
     <title>System</title>
-    <link rel="stylesheet" href="/css/config.css" />
+    <link rel="stylesheet" href="/css/system.css" />
 </head>
 <body>
     <div layout:fragment="main">
         <h1 class="h2">System</h1>
 
-        <div>Mem use: <strong th:text="${memUsed}"/>M/<span th:text="${memTotal}"/>M, <strong th:text="${threads.size()}"/> threads running.</div>
+        <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>
         <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>
                 </tr>
                 </thead>
                 <tbody>
-                <tr th:each="thread : ${threads}">
+                <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>
                 </tr>

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ public ConfigTemplateModel(String pageTitle, String logoTitle, Map<String, Strin`
`13`	`13`
`14`	`14`	`public void apply(Model model) {`
`15`	`15`	`super.apply(model);`
`16`		`- model.addAttribute("configInfo", configInfo);`
	`16`	`+ model.addAttribute("configModel", this);`
`17`	`17`	`}`
`18`	`18`	`}`