فهرست منبع

update AppNameInitializer

hante 4 روز پیش
والد
کامیت
8af56a1658

+ 1 - 1
ggits-comm-server/src/main/java/com/sig/ggits/comm/server/AppNameInitializer.java

@@ -16,7 +16,7 @@ public class AppNameInitializer implements ApplicationContextInitializer<Configu
 
             final Environment env = context.getEnvironment();
             final String appName = env.getProperty("spring.application.name", GgitsCommServerApplication.APPLICATION_NAME);
-            final String clusterEnabled = env.getProperty("cluster.enabled", "false");
+            final String clusterEnabled = env.getProperty("cluster.enabled", "true");
             if (Boolean.parseBoolean(clusterEnabled)) {
                 final String clusterId = env.getProperty("cluster.id", "1");
                 applicationName = appName + "-" + clusterId;

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

@@ -3,8 +3,8 @@
     <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
 
     <property name="APP_CLASS_PATH"  value="com.sig.ggits.comm.server"/>
-    <property name="PROJECT_PREFIX"  value="ggits-comm"/>
-    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}-server"/>
+    <property name="PROJECT_PREFIX"  value="ggits-comm-server"/>
+    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}"/>
     <property name="ROOT_LOG_LEVEL"  value="INFO"/>
     <property name="LOG_CHARSET"     value="UTF-8" />
     <property name="FILE_LOG_CHARSET" value="UTF-8" />
@@ -16,9 +16,9 @@
     <property name="LOG_FILE_NAME"             value="${PROJECT_NAME}.log"/>
     <property name="LOG_FILE_NAME_ERROR"       value="${PROJECT_NAME}.err.log"/>
     <property name="LOG_FILE_NAME_BACKUP"      value="%d{yyyyMMdd}_%i.log.gz"/>
-    <property name="LOG_FILE_NAME_PACKET"      value="${PROJECT_PREFIX}-packet"/>
-    <property name="LOG_FILE_NAME_CLUSTER"     value="${PROJECT_PREFIX}-cluster.log"/>
-    <property name="LOG_FILE_NAME_HEALTH"      value="${PROJECT_PREFIX}-health.log"/>
+    <property name="LOG_FILE_NAME_PACKET"      value="${PROJECT_PREFIX}.packet"/>
+    <property name="LOG_FILE_NAME_CLUSTER"     value="${PROJECT_PREFIX}.cluster.log"/>
+    <property name="LOG_FILE_NAME_HEALTH"      value="${PROJECT_PREFIX}.health.log"/>
 
     <property name="MAX_FILESIZE" value="80MB"/>
     <property name="MAX_HISTORY"  value="10"/>

+ 1 - 1
ggits-etlp-server/src/main/java/com/sig/ggits/etlp/server/AppNameInitializer.java

@@ -16,7 +16,7 @@ public class AppNameInitializer implements ApplicationContextInitializer<Configu
 
             final Environment env = context.getEnvironment();
             final String appName = env.getProperty("spring.application.name", GgitsEtlpServerApplication.APPLICATION_NAME);
-            final String clusterEnabled = env.getProperty("cluster.enabled", "false");
+            final String clusterEnabled = env.getProperty("cluster.enabled", "true");
             if (Boolean.parseBoolean(clusterEnabled)) {
                 final String clusterId = env.getProperty("cluster.id", "1");
                 applicationName = appName + "-" + clusterId;

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

@@ -3,8 +3,8 @@
     <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
 
     <property name="APP_CLASS_PATH"  value="com.sig.ggits.etlp.server"/>
-    <property name="PROJECT_PREFIX"  value="ggits-etlp"/>
-    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}-server"/>
+    <property name="PROJECT_PREFIX"  value="ggits-etlp-server"/>
+    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}"/>
     <property name="ROOT_LOG_LEVEL"  value="INFO"/>
     <property name="LOG_CHARSET"     value="UTF-8" />
     <property name="FILE_LOG_CHARSET" value="UTF-8" />
@@ -16,10 +16,10 @@
     <property name="LOG_FILE_NAME"             value="${PROJECT_NAME}.log"/>
     <property name="LOG_FILE_NAME_ERROR"       value="${PROJECT_NAME}.err.log"/>
     <property name="LOG_FILE_NAME_BACKUP"      value="%d{yyyyMMdd}_%i.log.gz"/>
-    <property name="LOG_FILE_NAME_PACKET"      value="${PROJECT_PREFIX}-service"/>
-    <property name="LOG_FILE_NAME_SCHEDULE"    value="${PROJECT_PREFIX}-schedule.log"/>
-    <property name="LOG_FILE_NAME_CLUSTER"     value="${PROJECT_PREFIX}-cluster.log"/>
-    <property name="LOG_FILE_NAME_HEALTH"      value="${PROJECT_PREFIX}-health.log"/>
+    <property name="LOG_FILE_NAME_PACKET"      value="${PROJECT_PREFIX}.service"/>
+    <property name="LOG_FILE_NAME_SCHEDULE"    value="${PROJECT_PREFIX}.schedule.log"/>
+    <property name="LOG_FILE_NAME_CLUSTER"     value="${PROJECT_PREFIX}.cluster.log"/>
+    <property name="LOG_FILE_NAME_HEALTH"      value="${PROJECT_PREFIX}.health.log"/>
 
     <property name="MAX_FILESIZE" value="80MB"/>
     <property name="MAX_HISTORY"  value="10"/>

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

@@ -3,8 +3,8 @@
     <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
 
     <property name="APP_CLASS_PATH"  value="com.sig.ggits.tsinfo.server"/>
-    <property name="PROJECT_PREFIX"  value="ggits"/>
-    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}-tsinfo-server"/>
+    <property name="PROJECT_PREFIX"  value="ggits-tsinfo-server"/>
+    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}"/>
     <property name="ROOT_LOG_LEVEL"  value="INFO"/>
     <property name="LOG_CHARSET"     value="UTF-8" />
     <property name="FILE_LOG_CHARSET" value="UTF-8" />
@@ -16,9 +16,9 @@
     <property name="LOG_FILE_NAME"             value="${PROJECT_NAME}.log"/>
     <property name="LOG_FILE_NAME_ERROR"       value="${PROJECT_NAME}.err.log"/>
     <property name="LOG_FILE_NAME_BACKUP"      value="%d{yyyyMMdd}_%i.log.gz"/>
-    <property name="LOG_FILE_NAME_PACKET"      value="${PROJECT_PREFIX}-packet"/>
-    <property name="LOG_FILE_NAME_SCHEDULE"    value="${PROJECT_PREFIX}-schedule.log"/>
-    <property name="LOG_FILE_NAME_HEALTH"      value="${PROJECT_PREFIX}-health.log"/>
+    <property name="LOG_FILE_NAME_PACKET"      value="${PROJECT_PREFIX}.packet"/>
+    <property name="LOG_FILE_NAME_SCHEDULE"    value="${PROJECT_PREFIX}.schedule.log"/>
+    <property name="LOG_FILE_NAME_HEALTH"      value="${PROJECT_PREFIX}.health.log"/>
 
     <property name="MAX_FILESIZE" value="10MB"/>
     <property name="MAX_HISTORY"  value="30"/>

+ 1 - 1
sig-comm-server/src/main/java/com/sig/comm/server/AppNameInitializer.java

@@ -16,7 +16,7 @@ public class AppNameInitializer implements ApplicationContextInitializer<Configu
 
             final Environment env = context.getEnvironment();
             final String appName = env.getProperty("spring.application.name", SigCommServerApplication.APPLICATION_NAME);
-            final String clusterEnabled = env.getProperty("cluster.enabled", "false");
+            final String clusterEnabled = env.getProperty("cluster.enabled", "true");
             if (Boolean.parseBoolean(clusterEnabled)) {
                 final String clusterId = env.getProperty("cluster.id", "1");
                 applicationName = appName + "-" + clusterId;

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

@@ -3,8 +3,8 @@
     <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
 
     <property name="APP_CLASS_PATH"  value="com.sig.comm.server"/>
-    <property name="PROJECT_PREFIX"  value="sig-comm"/>
-    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}-server"/>
+    <property name="PROJECT_PREFIX"  value="sig-comm-server"/>
+    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}"/>
     <property name="ROOT_LOG_LEVEL"  value="INFO"/>
     <property name="LOG_CHARSET"     value="UTF-8" />
     <property name="FILE_LOG_CHARSET" value="UTF-8" />
@@ -16,11 +16,11 @@
     <property name="LOG_FILE_NAME"             value="${PROJECT_NAME}.log"/>
     <property name="LOG_FILE_NAME_ERROR"       value="${PROJECT_NAME}.err.log"/>
     <property name="LOG_FILE_NAME_BACKUP"      value="%d{yyyyMMdd}_%i.log.gz"/>
-    <property name="LOG_FILE_NAME_PACKET"      value="${PROJECT_PREFIX}-packet"/>
-    <property name="LOG_FILE_NAME_SCHEDULE"    value="${PROJECT_PREFIX}-schedule.log"/>
-    <property name="LOG_FILE_NAME_CLUSTER"     value="${PROJECT_PREFIX}-cluster.log"/>
-    <property name="LOG_FILE_NAME_HEALTH"      value="${PROJECT_PREFIX}-health.log"/>
-    <property name="LOG_FILE_NAME_SESSION"     value="${PROJECT_PREFIX}-session.log"/>
+    <property name="LOG_FILE_NAME_PACKET"      value="${PROJECT_PREFIX}.packet"/>
+    <property name="LOG_FILE_NAME_SCHEDULE"    value="${PROJECT_PREFIX}.schedule.log"/>
+    <property name="LOG_FILE_NAME_CLUSTER"     value="${PROJECT_PREFIX}.cluster.log"/>
+    <property name="LOG_FILE_NAME_HEALTH"      value="${PROJECT_PREFIX}.health.log"/>
+    <property name="LOG_FILE_NAME_SESSION"     value="${PROJECT_PREFIX}.session.log"/>
 
     <property name="MAX_FILESIZE" value="80MB"/>
     <property name="MAX_HISTORY"  value="10"/>

+ 3 - 3
sig-common/src/main/java/com/sig/common/aspect/SqlOperationAspect.java

@@ -129,14 +129,14 @@ public class SqlOperationAspect extends AbstractLoggingAspect {
         String info = LogUtils.elapsedLog(type, tableName, executionTime);
         if (paramValue != null) {
             if (paramValue2 != null) {
-                log.info("[DBMS] {}: {}, {}, Exception: {}", info, paramValue, paramValue2, errMessage);
+                log.error("[DBMS] {}: {}, {}, Exception: {}", info, paramValue, paramValue2, errMessage);
             }
             else {
-                log.info("[DBMS] {}: {}, Exception: {}", info, paramValue, errMessage);
+                log.error("[DBMS] {}: {}, Exception: {}", info, paramValue, errMessage);
             }
         }
         else {
-            log.info("[DBMS] {}: Exception: {}", info, errMessage);
+            log.error("[DBMS] {}: Exception: {}", info, errMessage);
         }
     }
 

+ 1 - 1
sig-todp-server/src/main/java/com/sig/todp/server/AppNameInitializer.java

@@ -16,7 +16,7 @@ public class AppNameInitializer implements ApplicationContextInitializer<Configu
 
             final Environment env = context.getEnvironment();
             final String appName = env.getProperty("spring.application.name", SigTodpServerApplication.APPLICATION_NAME);
-            final String clusterEnabled = env.getProperty("cluster.enabled", "false");
+            final String clusterEnabled = env.getProperty("cluster.enabled", "true");
             if (Boolean.parseBoolean(clusterEnabled)) {
                 final String clusterId = env.getProperty("cluster.id", "1");
                 applicationName = appName + "-" + clusterId;

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

@@ -3,8 +3,8 @@
     <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
 
     <property name="APP_CLASS_PATH"  value="com.sig.todp.server"/>
-    <property name="PROJECT_PREFIX"  value="sig-todp"/>
-    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}-server"/>
+    <property name="PROJECT_PREFIX"  value="sig-todp-server"/>
+    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}"/>
     <property name="ROOT_LOG_LEVEL"  value="INFO"/>
     <property name="LOG_CHARSET"     value="UTF-8" />
     <property name="FILE_LOG_CHARSET" value="UTF-8" />
@@ -16,10 +16,10 @@
     <property name="LOG_FILE_NAME"             value="${PROJECT_NAME}.log"/>
     <property name="LOG_FILE_NAME_ERROR"       value="${PROJECT_NAME}.err.log"/>
     <property name="LOG_FILE_NAME_BACKUP"      value="%d{yyyyMMdd}_%i.log.gz"/>
-    <property name="LOG_FILE_NAME_CENTER"      value="${PROJECT_PREFIX}-center"/>
-    <property name="LOG_FILE_NAME_SCHEDULE"    value="${PROJECT_PREFIX}-schedule.log"/>
-    <property name="LOG_FILE_NAME_CLUSTER"     value="${PROJECT_PREFIX}-cluster.log"/>
-    <property name="LOG_FILE_NAME_HEALTH"      value="${PROJECT_PREFIX}-health.log"/>
+    <property name="LOG_FILE_NAME_CENTER"      value="${PROJECT_PREFIX}.center"/>
+    <property name="LOG_FILE_NAME_SCHEDULE"    value="${PROJECT_PREFIX}.schedule.log"/>
+    <property name="LOG_FILE_NAME_CLUSTER"     value="${PROJECT_PREFIX}.cluster.log"/>
+    <property name="LOG_FILE_NAME_HEALTH"      value="${PROJECT_PREFIX}.health.log"/>
 
     <property name="MAX_FILESIZE" value="80MB"/>
     <property name="MAX_HISTORY"  value="10"/>