Bläddra i källkod

update cluster process

HANTE 2 månader sedan
förälder
incheckning
b4c30565c1

+ 1 - 1
utic-ptis-server/src/main/java/com/utic/center/utic/ptis/server/config/ApplicationConfig.java

@@ -19,8 +19,8 @@ import javax.annotation.PostConstruct;
 @ConfigurationProperties(prefix = "application")
 public class ApplicationConfig {
 
-    private String processName = "utic-ptis-server";
     private String processId = "70080";
+    private String processName = "utic-ptis-server";
     private double cpuLimits = 75;
     private int errTimeGap = 120;
     private int prcsThreadCount = 10;

+ 7 - 6
utic-ptis-server/src/main/java/com/utic/center/utic/ptis/server/controller/UticPtisServerRestController.java

@@ -22,17 +22,17 @@ public class UticPtisServerRestController {
         long hours = TimeUnit.HOURS.convert(elapsed, TimeUnit.MILLISECONDS);
         long minutes = TimeUnit.MINUTES.convert(elapsed, TimeUnit.MILLISECONDS);
         long seconds = TimeUnit.SECONDS.convert(elapsed, TimeUnit.MILLISECONDS);
-        long miliSeconds = TimeUnit.MILLISECONDS.convert(elapsed, TimeUnit.MILLISECONDS) % 1000L;
+        long milliSeconds = elapsed % 1000L;
 //        long microSeconds = TimeUnit.MICROSECONDS.convert(elapsed, TimeUnit.MILLISECONDS) % 1000L;
 //        long nanoSeconds = TimeUnit.NANOSECONDS.convert(elapsed, TimeUnit.MILLISECONDS) % 1000L;
         if (hours > 0L) {
-            return String.format("%,d hr. %2d min. %2d sec. %3d ms.", hours, minutes, seconds, miliSeconds);
+            return String.format("%,d hr. %2d min. %2d sec. %3d ms.", hours, minutes, seconds, milliSeconds);
         } else if (minutes > 0L) {
-            return String.format("%2d min. %2d sec. %3d ms.", minutes, seconds, miliSeconds);
+            return String.format("%2d min. %2d sec. %3d ms.", minutes, seconds, milliSeconds);
         } else if (seconds > 0L) {
-            return String.format("%2d sec. %3d ms.", seconds, miliSeconds);
+            return String.format("%2d sec. %3d ms.", seconds, milliSeconds);
         } else {
-            return String.format("%3d ms.", miliSeconds);
+            return String.format("%3d ms.", milliSeconds);
         }
     }
     
@@ -45,7 +45,8 @@ public class UticPtisServerRestController {
         sb.append(heading).append(sep);
         sb.append("UTIC Center PTIS ETLP Server Running Information").append(sep);
         sb.append(heading).append(sep);
-        sb.append(String.format("Process Id: %s, %s, %s, %s", this.config.getProcessId(), this.config.getProcessName(), this.config.getBootingTime(), TimeUtils.now())).append(sep);
+        sb.append(String.format("Process: %s(%s), Booting: %s, Now: %s",
+                this.config.getProcessId(), this.config.getProcessName(), this.config.getBootingTime(), TimeUtils.now())).append(sep);
         sb.append(heading).append(sep);
         sb.append(String.format("%s %-20.20s %-20.20s %-31.31s %-31.31s %-31.31s %s",
                 " SEQ", "Start", "End", "TRAF(LastRegDate(CURR/TOT))", "EVNT(LastRegDate(CURR/TOT))", "INCD(LastRegDate(CURR/TOT)", "Elapsed Time")).append(sep);

+ 0 - 1
utic-ptis-server/src/main/java/com/utic/center/utic/ptis/server/dao/repository/ProcessStateRepository.java

@@ -27,5 +27,4 @@ public class ProcessStateRepository {
         return this.mapper.updateProcessStateStop(obj);
     }
 
-
 }

+ 0 - 1
utic-ptis-server/src/main/resources/mybatis/mapper/UticPtisServerMapper.xml

@@ -259,5 +259,4 @@
         ]]>
     </delete>
 
-
 </mapper>

+ 1 - 1
utic-stat-server/src/main/java/com/utic/center/utic/stat/server/config/ApplicationConfig.java

@@ -19,8 +19,8 @@ import javax.annotation.PostConstruct;
 @ConfigurationProperties(prefix = "application")
 public class ApplicationConfig {
 
-    private String processName = "utic-stat-server";
     private String processId = "70040";
+    private String processName = "utic-stat-server";
     private double cpuLimits = 75;
     private int errTimeGap = 120;
     private int prcsThreadCount = 10;

+ 2 - 1
utic-stat-server/src/main/java/com/utic/center/utic/stat/server/controller/UticStatServerRestController.java

@@ -26,7 +26,8 @@ public class UticStatServerRestController {
         sb.append(heading).append(sep);
         sb.append("UTIC Center DWDB Statistics Processing Server").append(sep);
         sb.append(heading).append(sep);
-        sb.append(String.format("Process Id: %s, %s, %s", this.config.getProcessId(), this.config.getBootingTime(), TimeUtils.now())).append(sep);
+        sb.append(String.format("Process: %s(%s), Booting: %s, Now: %s",
+                this.config.getProcessId(), this.config.getProcessName(), this.config.getBootingTime(), TimeUtils.now())).append(sep);
         sb.append(heading).append(sep);
         sb.append(String.format("%s %-20.20s %-20.20s    TOTAL  01_TRAF  04_ETLP  05_FLTR  05_STAT  15_STAT  01_PTRN",
                 " SEQ", "Start", "End")).append(sep);

+ 0 - 1
utic-stat-server/src/main/java/com/utic/center/utic/stat/server/dao/repository/ProcessStateRepository.java

@@ -27,5 +27,4 @@ public class ProcessStateRepository {
         return this.mapper.updateProcessStateStop(obj);
     }
 
-
 }

+ 1 - 1
utic-traf-server/src/main/java/com/utic/center/utic/traf/server/config/ApplicationConfig.java

@@ -19,8 +19,8 @@ import javax.annotation.PostConstruct;
 @ConfigurationProperties(prefix = "application")
 public class ApplicationConfig {
 
-    private String processName = "utic-traf-server";
     private String processId = "70030";
+    private String processName = "utic-traf-server";
     private double cpuLimits = 75;
     private int errTimeGap = 120;
     private int prcsThreadCount = 10;

+ 2 - 1
utic-traf-server/src/main/java/com/utic/center/utic/traf/server/controller/UticTrafServerRestController.java

@@ -26,7 +26,8 @@ public class UticTrafServerRestController {
         sb.append(heading).append(sep);
         sb.append("UTIC Center ITS Traffic Processing Server").append(sep);
         sb.append(heading).append(sep);
-        sb.append(String.format("Process Id: %s, %s, %s", this.config.getProcessId(), this.config.getBootingTime(), TimeUtils.now())).append(sep);
+        sb.append(String.format("Process: %s(%s), Booting: %s, Now: %s",
+                this.config.getProcessId(), this.config.getProcessName(), this.config.getBootingTime(), TimeUtils.now())).append(sep);
         sb.append(heading).append(sep);
         sb.append(String.format("%s %-20.20s %-20.20s    TOTAL RCV_TRAF  COLLECT   FUSION  MISSING UTIADMIN  TRAFFIC     DWDB  PREPARE    AFTER",
                 " SEQ", "Start", "End")).append(sep);