Browse Source

test code add

shjung 10 months ago
parent
commit
2fc6fd38f1

+ 6 - 6
src/main/java/com/evp/comm/server/controller/SigCommServerController.java

@@ -21,20 +21,20 @@ public class SigCommServerController {
 
     @GetMapping(value = "", produces = {"application/json; charset=utf8"})
     public String info() {
-        String sep = System.getProperty("line.separator");
+        String sep = System.lineSeparator();
         String heading = "---------------------------------------------------------------------------------------------------------";
 
         EvpsCenter center = ApplicationRepository.center;
 
         StringBuilder sb = new StringBuilder();
         sb.append(heading).append(sep);
-        sb.append("UTIC Local Signal Communication Server").append(sep);
+        sb.append("UTIC EVPS Communication Server").append(sep);
         sb.append(heading).append(sep);
         sb.append(String.format("%s, %s",
                 center.getCenterId(), center.getIpAddress() + sep));
         sb.append(heading).append(sep);
-        sb.append(String.format("%s %-15.15s %-8.8s %-20.20s %-20.20s %-20.20s %s",
-                "---", "IP Address", "Network",
+        sb.append(String.format("%s %-15.15s  %-8.8s %-20.20s %-20.20s %-20.20s %s",
+                "Center", "IP Address", "Network",
                 "Connect Time", "Disconnect Time",
                 "Last Comm Time", "Center Name")).append(sep);
         sb.append(heading).append(sep);
@@ -53,11 +53,11 @@ public class SigCommServerController {
                 commStatus = "Connect";
                 onLine++;
             }
-            sb.append(String.format("%s %-15.15s %-8.8s %-20.20s %-20.20s %-20.20s %s",
+            sb.append(String.format("%-6s %-15s  %-8s %-20s %-20s %-20s %s",
                     region.getCenterId(), region.getIpAddress(), commStatus,
                     region.getNetState().getConnectTimeString(), region.getNetState().getDisconnectTimeString(),
                     region.getNetState().getLastCommTimeString(),
-                    region.getCenterNm()) + sep);
+                    region.getCenterNm())).append(sep);
 
         }
         sb.append(heading).append(sep);

+ 1 - 0
src/main/java/com/evp/comm/server/kafka/dto/KafkaEvpsNodeDto.java

@@ -19,6 +19,7 @@ public class KafkaEvpsNodeDto {
     private String serviceId;
     private List<EvpsNodeInfo> nodeList = new ArrayList<>();
 
+    @ToString
     @Getter
     @Builder
     @NoArgsConstructor

+ 2 - 0
src/main/java/com/evp/comm/server/xnet/server/process/response/EvpsNode.java

@@ -86,6 +86,7 @@ public class EvpsNode implements EvpsCommResponse {
         int idx = 0;
         // 교차로수(2 Byte)
         int nodeCount = ((buffer[idx++] & 0xFF) << 8) | (buffer[idx++] & 0xFF);
+        log.info("[{}], EvpsNode.response: nodeCount({}).", center.getLogKey(), nodeCount);
         int reqDataSize = EvpsProtocolConst.MIN_NODE_DATA_NODE_SIZE * nodeCount;
         if ((buffer.length - idx) < reqDataSize) {
             log.error("[{}], EvpsNode.response: Data Length Error: nodeCount({}), Required data length({}), Cur({}). will be closed.",
@@ -121,6 +122,7 @@ public class EvpsNode implements EvpsCommResponse {
             lists.add(param);
 
             int phaseCount = ((buffer[idx++] & 0xFF) << 8) | (buffer[idx++] & 0xFF);
+            log.info("[{}], EvpsNode.response: node({}), phaseCount({}).", center.getLogKey(), nodeId, phaseCount);
             int reqPhaseDataSize = EvpsProtocolConst.NODE_DATA_PHASE_SIZE * phaseCount;
             if ((buffer.length - idx) < reqPhaseDataSize) {
                 log.error("[{}], EvpsNode.response: Phase Data Length Error: Required data length({}), Cur({}). will be closed.",

+ 1 - 0
src/main/java/com/evp/comm/server/xnet/server/process/response/EvpsService.java

@@ -122,6 +122,7 @@ public class EvpsService implements EvpsCommResponse {
         int distance    = ((buffer[idx++] & 0xFF) << 24) | ((buffer[idx++] & 0xFF) << 16) | ((buffer[idx++] & 0xFF) << 8) | (buffer[idx++] & 0xFF);
 
         int routeCount = ((buffer[idx++] & 0xFF) << 8) | (buffer[idx++] & 0xFF);
+        log.info("[{}], EvpsService.response: routeCount({}).", center.getLogKey(), routeCount);
         int reqDataSize = EvpsProtocolConst.SERVICE_DATA_ROUTE_SIZE * routeCount;
         if ((buffer.length - idx) != reqDataSize) {
             log.error("[{}], EvpsService.response: Data Length Error: routeCount({}), Required data length({}), Cur({}). will be closed.",

+ 38 - 17
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.evp.comm.server"/>
-    <property name="PROJECT_PREFIX"  value="evp"/>
-    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}-comm-server"/>
+    <property name="PROJECT_PREFIX"  value="evp-comm"/>
+    <property name="PROJECT_NAME"    value="${PROJECT_PREFIX}-server"/>
     <property name="ROOT_LOG_LEVEL"  value="INFO"/>
     <property name="LOG_CHARSET"     value="UTF-8" />
     <property name="LOG_PATH"        value="${user.home}/logs/${PROJECT_NAME}/"/>
@@ -38,22 +38,43 @@
         <appender-ref ref="FILE_ERROR"/>
     </root>
 
-    <logger name="${APP_CLASS_PATH}.aspect" level="INFO" additivity="false">
-        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="FILE_ASPECT"/>
-        <appender-ref ref="FILE_ERROR"/>
-    </logger>
+    <springProfile name="dev">
+        <logger name="${APP_CLASS_PATH}.aspect" level="INFO" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE_ASPECT"/>
+            <appender-ref ref="FILE_ERROR"/>
+        </logger>
 
-    <logger name="${APP_CLASS_PATH}.kafka" level="INFO" additivity="false">
-        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="FILE_KAFKA"/>
-        <appender-ref ref="FILE_ERROR"/>
-    </logger>
+        <logger name="${APP_CLASS_PATH}.kafka" level="INFO" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE_KAFKA"/>
+            <appender-ref ref="FILE_ERROR"/>
+        </logger>
 
-    <logger name="${APP_CLASS_PATH}.xnet" level="INFO" additivity="false">
-        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="FILE_PACKET"/>
-        <appender-ref ref="FILE_ERROR"/>
-    </logger>
+        <logger name="${APP_CLASS_PATH}.xnet" level="INFO" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE_PACKET"/>
+            <appender-ref ref="FILE_ERROR"/>
+        </logger>
+    </springProfile>
+
+    <springProfile name="prod">
+        <logger name="${APP_CLASS_PATH}.aspect" level="INFO" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE_ASPECT"/>
+            <appender-ref ref="FILE_ERROR"/>
+        </logger>
 
+        <logger name="${APP_CLASS_PATH}.kafka" level="INFO" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE_KAFKA"/>
+            <appender-ref ref="FILE_ERROR"/>
+        </logger>
+
+        <logger name="${APP_CLASS_PATH}.xnet" level="INFO" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE_PACKET"/>
+            <appender-ref ref="FILE_ERROR"/>
+        </logger>
+    </springProfile>
 </configuration>

File diff suppressed because it is too large
+ 230 - 4
src/test/java/com/evp/comm/server/EvpCommServerApplicationTests.java


Some files were not shown because too many files changed in this diff