Browse Source

maintenance 20230904 not modify, for version only

shjung 1 year ago
parent
commit
eb21db24fc

+ 0 - 1
conf/vds-comm-server.pid

@@ -1 +0,0 @@
-16088

+ 4 - 3
src/main/java/com/its/vds/service/UnitSystService.java

@@ -37,7 +37,7 @@ public class UnitSystService {
     private final TbUnitSystStts unitSystStts = TbUnitSystStts.builder().build();
 
     private String processId;
-    private int sttsMin;
+    private int historyMin;
     public static String _srcIpAddr;
 
     @PostConstruct
@@ -45,6 +45,7 @@ public class UnitSystService {
         log.info("[INIT...] UnitSystService.init: start.");
         ProcessConfig processConfig = (ProcessConfig) AppUtils.getBean(ProcessConfig.class);
         this.processId = processConfig.getId();
+        this.historyMin = -1;
 
         try {
             InetAddress local = InetAddress.getLocalHost();
@@ -102,9 +103,9 @@ public class UnitSystService {
         boolean insHs = false;
         Calendar cal = Calendar.getInstance();
         int min = cal.get(Calendar.MINUTE);
-        if ((min % 5) == 0) {
+        if ((min % 5) == 0 && this.historyMin != min) {
             insHs = true;
-            this.sttsMin = min;
+            this.historyMin = min;
         }
 
         String SYST_STTS_CD = isRun ? "SPS1" : "SPS3";

+ 4 - 4
src/main/java/com/its/vds/service/VdsCtlrService.java

@@ -30,14 +30,14 @@ public class VdsCtlrService {
 
     private VdsCtlrMapper vdsCtlrMapper;
     private VdsDtctMapper vdsDtctMapper;
-
-    private int sttsMin;
+    private int historyMin;
 
     @PostConstruct
     private void init() {
         log.info("VdsCtlrService.init: Start.");
         this.vdsCtlrMapper = (VdsCtlrMapper) AppUtils.getBean(VdsCtlrMapper.class);
         this.vdsDtctMapper = (VdsDtctMapper) AppUtils.getBean(VdsDtctMapper.class);
+        this.historyMin = -1;
 
         //loadDb();
         //updateCtlrStts(true);
@@ -153,9 +153,9 @@ public class VdsCtlrService {
         boolean insHs = false;
         Calendar cal = Calendar.getInstance();
         int min = cal.get(Calendar.MINUTE);
-        if ((min % 5) == 0) {
+        if ((min % 5) == 0 && this.historyMin != min) {
             insHs = true;
-            this.sttsMin = min;
+            this.historyMin = min;
         }
 
         //제어기 상태정보 업데이트

+ 2 - 1
src/main/java/com/its/vds/xnettcp/vds/VdsTcpClient.java

@@ -80,7 +80,8 @@ public class VdsTcpClient implements Callable<Object> {
 
         // 연결 리스너 추가
         this.channelFuture.addListener(new ChannelFutureListener() {
-            @Override public void operationComplete(ChannelFuture future) {
+            @Override
+            public void operationComplete(ChannelFuture future) {
                 if (future.isSuccess()) {
                     //log.info("[{}]. VDS Controller Channel open");
                     channelOpen(future.channel());

+ 1 - 1
src/main/java/com/its/vds/xnettcp/vds/handler/VdsTcpClientIdleHandler.java

@@ -92,7 +92,7 @@ public class VdsTcpClientIdleHandler extends IdleStateHandler {
             MDC.put("id", obj.getLogKey());
             ID = obj.getVDS_CTLR_ID();
         }
-        log.error("[{}]. EXCE: exceptionCaught: {}", ID, cause.getMessage());
+        log.error("[{}]. EXCE: exceptionCaught: {}, {}", ID, cause, cause.getMessage());
         if (obj != null) {
             MDC.remove(obj.getLogKey());
             MDC.clear();

+ 1 - 1
src/main/java/com/its/vds/xnettcp/vds/process/Job_ACK.java

@@ -19,7 +19,7 @@ public class Job_ACK implements JobProtocol {
 		}
 
 		TbVdsCtlr obj = this.packet.getVdsObj();
-		log.error("[{}]. Job_ACK: Received.", obj.getVDS_CTLR_ID());
+		log.info("[{}]. Job_ACK: Received.", obj.getVDS_CTLR_ID());
 		return 1;
 	}
 

+ 1 - 1
src/main/resources/logback-spring.xml

@@ -23,7 +23,7 @@
     <property name="MAX_FILESIZE" value="10MB"/>
     <property name="MAX_HISTORY"  value="30"/>
     <property name="LOG_PATTERN_FILE"        value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
-    <property name="LOG_PATTERN_ERROR"       value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%30t] [%5level] %42logger{35}.%-20M ${PID:-} %n%msg%n"/>
+    <property name="LOG_PATTERN_ERROR"       value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%30t] [%5level] %42logger{35}.%-20M %msg%n"/>
     <property name="LOG_PATTERN_PACKET"      value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_SESSION"     value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_CENTER_COMM" value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>

BIN
vds-comm-server-0.0.1.jar


BIN
vds-comm-server.exe


BIN
vds-comm-server.exe.run


+ 0 - 1
vds-comm-server.txt.jsmooth

@@ -6,7 +6,6 @@
 <JVMSearchPath>jdkpath</JVMSearchPath>
 <JVMSearchPath>exepath</JVMSearchPath>
 <JVMSearchPath>jview</JVMSearchPath>
-<arguments></arguments>
 <currentDirectory>${EXECUTABLEPATH}</currentDirectory>
 <embeddedJar>true</embeddedJar>
 <executableName>vds-comm-server.exe</executableName>