Przeglądaj źródła

maximumPoolSize not set

shjung 8 miesięcy temu
rodzic
commit
c28a997685

+ 26 - 0
README-tsinfo.txt

@@ -0,0 +1,26 @@
+
+#############################################################################################################
+# COUTION, NOTICE
+#############################################################################################################
+# GGITS TSINFO Linkage Process Management
+#
+# $ cd ~/bin              : cd program directory
+# $ bin                   : alias cd ~/bin
+#
+# $ stat.sh               : monitoring process running state
+#
+# $ info.sh tsinfo        : monitoring tsinfo process communication state
+#
+# $ start.sh tsinfo       : start tsinfo process
+#
+# $ stop.sh tsinfo        : stop tsinfo process
+#
+#############################################################################################################
+# LOG FILE MONITORING
+#############################################################################################################
+# cd ~/logs               : cd log file directory
+# $logs                   : alias cd ~/logs/ggits-tsinfo-server
+#
+#############################################################################################################
+
+

+ 47 - 0
README.txt

@@ -0,0 +1,47 @@
+
+###################################################################################################
+# SIGNAL Process Management
+#
+# ~/bin/sig-comm-server  : signal comm server - seoul, ...
+# ~/bin/sig-todp-server  : signal tod process server
+# ~/bin/ggits-comm-server: ggits signal comm server, from 192.168.24.22/ggits-tsinfo-server
+# ~/bin/ggits-etlp-server: ggits database etl process server
+#
+###################################################################################################
+#
+# $ cd ~/bin            : change directory program location
+# $ bin                 : alias cd ~/bin
+#
+# $ stat.sh             : process running state
+#
+# $ start.sh all        : start all process
+#     $ start.sh comm   : start signal communication process(sig-comm-server)
+#     $ start.sh todp   : start signal communication process(sig-todp-server)
+#     $ start.sh etlp   : start signal communication process(ggits-etlp-server)
+#     $ start.sh ggits  : start signal communication process(ggits-ggits-server)
+#
+# $ stop.sh all         : stop all process
+#     $ stop.sh comm    : stop signal communication process(sig-comm-server)
+#     $ stop.sh todp    : stop signal communication process(sig-todp-server)
+#     $ stop.sh etlp    : stop signal communication process(ggits-etlp-server)
+#     $ stop.sh ggits   : stop signal communication process(ggits-ggits-server)
+#
+# $$$$$$$$$$ info.sh not supported in unix system.................................................
+# $ info.sh comm        : monitoring signal communication process(sig-comm-server)
+# $ info.sh todp        : monitoring signal communication process(sig-todp-server)
+# $ info.sh etlp        : monitoring signal communication process(ggits-etlp-server)
+# $ info.sh ggits       : monitoring signal communication process(ggits-ggits-server)
+#
+###################################################################################################
+# Log file monitoring
+#
+# $ cd ~/logs           : change directory log file location
+# $ logs                : alias cd  ~/logs
+# $ logcomm             : alias cd  ~/logs/sig-comm-server
+# $ logtodp             : alias cd  ~/logs/sig-todp-server
+# $ logggits            : alias cd  ~/logs/ggits-comm-server
+# $ logetlp             : alias cd  ~/logs/ggits-etlp-server
+#
+# cat, tail, vi, .... log file
+###################################################################################################
+

+ 6 - 8
bin/stop.sh

@@ -1,9 +1,7 @@
 #!/bin/sh
 
-#APP_HOME=/tcs/itcs/bin
-#LOG_HOME=/tcs/itcs/logs
-APP_HOME=/home/openvalue/bin
-LOG_HOME=/home/openvalue/logs
+APP_HOME=/tcs/itcs/bin
+LOG_HOME=/tcs/itcs/logs
 
 APP_NAME="-server-0.0.1.jar"
 GITS_APP="ggits-comm-server"
@@ -26,15 +24,15 @@ stop_program() {
                 kill -15 $PID
                 echo "    >> $PROGRAM_NAME, Killed process $PID"
 
-                LOOP=$(seq 0 12)
-                for i in $LOOP
+                for i in {0..12}
                 do
                   sleep 1
                   if [ -f "$PID_FILE" ]; then
                     echo "    >> $PROGRAM_NAME stopping.........."
                   else
                     echo "    >> $PROGRAM_NAME stopped.........."
-                    exit
+                    break
+                    #exit
                   fi
                 done
 
@@ -48,7 +46,7 @@ stop_program() {
                 rm $PID_FILE
             fi
         else
-            echo "$PROGRAM_NAME is not running...."
+            echo "    >> $PROGRAM_NAME is not running...."
             ps -eaf | grep $PROGRAM_NAME | grep -v grep |grep -v tail | wc -l
             ps -eaf | grep $PROGRAM_NAME | grep -v grep |grep -v tail
             #exit

+ 1 - 1
conf/ggits-tsinfo-server.yml

@@ -2,7 +2,7 @@ server:
   port: 9871
 
 application:
-#  ggits-server-ip: 192.168.10.66
+#  server-ip: 192.168.10.66
   server-ip: 127.0.0.1
 #  sta-path: /home/ggits/EasyTraffic/sta
   sta-path: C:\KoROAD\Z.GGITS\ggits\EasyTraffic\sta

+ 2 - 1
ggits-comm-server/src/main/resources/application.yml

@@ -17,8 +17,9 @@ spring:
     hikari:
       connection-test-query: SELECT 1 FROM DUAL
       minimumIdle: 5
-      maximumPoolSize: 20
+#      maximumPoolSize: 20
       idleTimeout: 30000
+      connection-timeout: 5000
   lifecycle:
     timeout-per-shutdown-phase: 10s
 

+ 2 - 1
ggits-comm-server/src/main/resources/logback-spring.xml

@@ -21,7 +21,8 @@
     <property name="MAX_FILESIZE" value="10MB"/>
     <property name="MAX_HISTORY"  value="10"/>
     <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 ${PID:-} %n%msg%n"/>-->
+    <property name="LOG_PATTERN_ERROR"       value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %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_SQL"         value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>

+ 3 - 1
ggits-etlp-server/src/main/resources/application.yml

@@ -23,8 +23,10 @@ spring:
       ggits:
         connection-test-query: SELECT 1 FROM DUAL
         minimumIdle: 5
-        maximumPoolSize: 20
+#        maximumPoolSize: 20
         idleTimeout: 30000
+  lifecycle:
+    timeout-per-shutdown-phase: 10s
 
 server:
   port: 9874

+ 2 - 1
ggits-etlp-server/src/main/resources/logback-spring.xml

@@ -20,7 +20,8 @@
     <property name="MAX_FILESIZE" value="10MB"/>
     <property name="MAX_HISTORY"  value="10"/>
     <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 ${PID:-} %n%msg%n"/>-->
+    <property name="LOG_PATTERN_ERROR"       value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_PACKET"      value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_SQL"         value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_SCHEDULE"    value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>

+ 1 - 1
ggits-tsinfo-server/conf/ggits-tsinfo-server.yml

@@ -1,5 +1,5 @@
 application:
-#  ggits-server-ip: 192.168.10.66
+#  server-ip: 192.168.10.66
   server-ip: 127.0.0.1
 #  sta-path: /home/ggits/EasyTraffic/sta
   sta-path: C:\KoROAD\Z.GGITS\ggits\EasyTraffic\sta

+ 2 - 0
ggits-tsinfo-server/src/main/resources/application.yml

@@ -11,6 +11,8 @@ spring:
   output:
     ansi:
       enabled: always
+  lifecycle:
+    timeout-per-shutdown-phase: 10s
 
 server:
   port: 9871

+ 2 - 1
ggits-tsinfo-server/src/main/resources/logback-spring.xml

@@ -19,7 +19,8 @@
     <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 ${PID:-} %n%msg%n"/>-->
+    <property name="LOG_PATTERN_ERROR"       value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_PACKET"      value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_SCHEDULE"    value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_CONSOLE"     value="[%d{HH:mm:ss.SSS}] [%5level] %msg %n"/>

+ 5 - 1
sig-comm-server/src/main/resources/application.yml

@@ -23,8 +23,12 @@ spring:
       password: siguser
       connection-test-query: SELECT 1 FROM DUAL
       minimumIdle: 5
-      maximumPoolSize: 20
+#      maximumPoolSize: 20
       idleTimeout: 30000
+      connection-timeout: 5000
+  lifecycle:
+    timeout-per-shutdown-phase: 10s
+
 server:
   port: 9871
   shutdown: graceful

+ 1 - 1
sig-comm-server/src/main/resources/logback-spring-appender.xml

@@ -50,7 +50,7 @@
             <pattern>${LOG_PATTERN_ASPECT}</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_ASPECT}.${LOG_FILE_NAME_BACKUP}</fileNamePattern>
+            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_ASPECT}.${LOG_FILE_NAME_BACKUP}</fileNamePattern>
             <maxFileSize>${MAX_FILESIZE}</maxFileSize>
             <maxHistory>${MAX_HISTORY}</maxHistory>
         </rollingPolicy>

+ 2 - 1
sig-comm-server/src/main/resources/logback-spring.xml

@@ -20,7 +20,8 @@
     <property name="MAX_FILESIZE" value="10MB"/>
     <property name="MAX_HISTORY"  value="10"/>
     <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 ${PID:-} %n%msg%n"/>-->
+    <property name="LOG_PATTERN_ERROR"       value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %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_ASPECT"      value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>

+ 21 - 8
sig-todp-server/src/main/java/com/sig/todp/server/process/dbms/DbmsDataProcess.java

@@ -82,7 +82,10 @@ public class DbmsDataProcess {
     }
 
     public void process(DbmsData data) {
-        int result = -1;
+        int result1 = -1;
+        int result2 = -1;
+        long elapsedTime1 = 0;
+        long elapsedTime2 = 0;
         int type = -1;
         int count = 0;
         RegionCenter center = data.getCenter();
@@ -97,21 +100,31 @@ public class DbmsDataProcess {
                     count = intTypeLists.size();
                     if (data.getCenter().isSimulateFlag()) {
                         // 상태정보 업데이트
-                        result = this.sigTodpServerDao.updateIntSimulationSend(intTypeLists);
+                        try {
+                            result1 = this.sigTodpServerDao.updateIntSimulationSend(intTypeLists);
+                        }
+                        catch (Exception e) {
+                            log.error("DbmsJobProcess.process: [{}]. {}, updateIntSimulationSend, Exception: {}", center.getLogKey(), type, e.getMessage());
+                        }
+                        elapsedTime1 = elapsed1.milliSeconds();
                     }
                     // TOD 데이터 무조건 업데이트
-                    result = this.sigTodpServerDao.updateIntSimulationSendTrans(intTypeLists);
+                    elapsed1.reset();
+                    try {
+                        result2 = this.sigTodpServerDao.updateIntSimulationSendTrans(intTypeLists);
+                    }
+                    catch (Exception e) {
+                        log.error("DbmsJobProcess.process: [{}]. {}, updateIntSimulationSendTrans, Exception: {}", center.getLogKey(), type, e.getMessage());
+                    }
+                    elapsedTime2 = elapsed1.milliSeconds();
                     break;
 
                 default:
                     log.error("DbmsJobProcess.process: Unknown Request {}.", type);
                     break;
             }
-            log.info("DbmsDataProcess.run: [{}]. {}, Request: {}, Result: {} EA. {}",
-                    center.getLogKey(), type, count, result, Elapsed.elapsedTimeStr(elapsed1.nanoSeconds()));
-        }
-        catch (Exception e) {
-            log.error("DbmsJobProcess.process: [{}]. {}, Exception: {}", center.getLogKey(), type, e.getMessage());
+            log.info("DbmsDataProcess.run: [{}]. Request: {}, updateIntSimulationSend({} EA. {} ms.), updateIntSimulationSendTrans({} EA. {} ms.)",
+                    center.getLogKey(), count, result1, elapsedTime1, result2, elapsedTime2);
         }
         finally {
             MDC.remove(center.getLogKey());

+ 4 - 3
sig-todp-server/src/main/java/com/sig/todp/server/repository/ApplicationRepository.java

@@ -47,6 +47,7 @@ public class ApplicationRepository {
             .maxIntNo(65535)
             .intCount(65535)
             .lastCommMilliSeconds(0)
+            .lastTodRunTime(0)
             .intMap(new HashMap<>())
             .build();
     private final ConcurrentHashMap<String, RegionCenter> centerMap = new ConcurrentHashMap<>();
@@ -69,7 +70,7 @@ public class ApplicationRepository {
             }
         }
         catch (Exception e) {
-            log.error("ApplicationRepository.initCtlrInfo: Exception: {}.", e.getMessage());
+            log.error("ApplicationRepository.initCenterMap: Exception: {}.", e.getMessage());
         }
     }
     private void initIntMap() {
@@ -82,7 +83,7 @@ public class ApplicationRepository {
             }
         }
         catch (Exception e) {
-            log.error("ApplicationRepository.initCtlrInfo: Exception: {}.", e.getMessage());
+            log.error("ApplicationRepository.initIntMap: Exception: {}.", e.getMessage());
         }
     }
 
@@ -92,7 +93,7 @@ public class ApplicationRepository {
     }
 
     public void loadCenterService() {
-        Elapsed elapsed = new Elapsed();
+//        Elapsed elapsed = new Elapsed();
         List<TbRegionCenter> lists = new ArrayList<TbRegionCenter>();
         try {
             lists = this.mapper.selectAll();

+ 5 - 1
sig-todp-server/src/main/resources/application.yml

@@ -23,8 +23,12 @@ spring:
       password: siguser
       connection-test-query: SELECT 1 FROM DUAL
       minimumIdle: 5
-      maximumPoolSize: 20
+#      maximumPoolSize: 20
       idleTimeout: 30000
+      connection-timeout: 5000
+  lifecycle:
+    timeout-per-shutdown-phase: 10s
+
 server:
   port: 9872
   shutdown: graceful

+ 1 - 1
sig-todp-server/src/main/resources/logback-spring-appender.xml

@@ -50,7 +50,7 @@
             <pattern>${LOG_PATTERN_ASPECT}</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_ASPECT}.${LOG_FILE_NAME_BACKUP}</fileNamePattern>
+            <fileNamePattern>${LOG_BACKUP_PATH}${LOG_FILE_NAME_ASPECT}.${LOG_FILE_NAME_BACKUP}</fileNamePattern>
             <maxFileSize>${MAX_FILESIZE}</maxFileSize>
             <maxHistory>${MAX_HISTORY}</maxHistory>
         </rollingPolicy>

+ 2 - 1
sig-todp-server/src/main/resources/logback-spring.xml

@@ -19,7 +19,8 @@
     <property name="MAX_FILESIZE" value="10MB"/>
     <property name="MAX_HISTORY"  value="10"/>
     <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 ${PID:-} %n%msg%n"/>-->
+    <property name="LOG_PATTERN_ERROR"       value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_CENTER"      value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_ASPECT"      value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_CONSOLE"     value="[%d{HH:mm:ss.SSS}] [%5level] %msg %n"/>