Browse Source

last dev2

shjung 11 months ago
parent
commit
94b82eb84c

+ 1 - 2
src/main/java/com/its/rota/server/xnet/server/codec/ItsAsnServerDecoder.java

@@ -31,7 +31,7 @@ public class ItsAsnServerDecoder extends MessageToMessageDecoder<ByteBuf> {
         CenterDto center = ApplicationRepository.getCenterObject(ctx.channel());
         if (center == null) {
             log.error("RECV: [{}]. Not Found Channel Center Object... Oops Will be closed.", NettyUtils.getAddress(ctx.channel()));
-            ApplicationRepository.closeChannel(center, ctx.channel());
+            ApplicationRepository.closeChannel(null, ctx.channel());
             return;
         }
 
@@ -95,7 +95,6 @@ public class ItsAsnServerDecoder extends MessageToMessageDecoder<ByteBuf> {
                 C2CAuthenticatedMessage c2c = new C2CAuthenticatedMessage();
                 c2c.decode(new ByteArrayInputStream(berOctetString.value, 0, berOctetString.value.length));
 //                log.info("RECV: [{}, {}]. C2C: {}", center.getLogKey(), center.getIpAddress(), c2c);
-                center.getNetState().setLastRecvTime();
 
                 RecvPacketDto packet = RecvPacketDto.builder()
                         .recvTime(recvTime)

+ 1 - 1
src/main/java/com/its/rota/server/xnet/server/codec/ItsAsnServerEncoder.java

@@ -33,7 +33,7 @@ public class ItsAsnServerEncoder extends MessageToByteEncoder<Object> {
         CenterDto center = ApplicationRepository.getCenterObject(ctx.channel());
         if (center == null) {
             log.error("SEND: [{}]. Not Found Channel Center Object... Oops Will be closed.", NettyUtils.getAddress(ctx.channel()));
-            ApplicationRepository.closeChannel(center, ctx.channel());
+            ApplicationRepository.closeChannel(null, ctx.channel());
             return;
         }
 

+ 2 - 2
src/main/java/com/its/rota/server/xnet/server/handler/ItsAsnServerPacketInboundHandler.java

@@ -39,7 +39,7 @@ public class ItsAsnServerPacketInboundHandler extends SimpleChannelInboundHandle
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         CenterDto center = ApplicationRepository.getCenterObject(ctx.channel());
         if (center == null) {
-            log.error("{}.userEventTriggered: Unknown Center: {}.", this.getClass().getSimpleName(), NettyUtils.getAddress(ctx.channel()));
+            log.error("{}.++channelInactive: Unknown Center: {}.", this.getClass().getSimpleName(), NettyUtils.getAddress(ctx.channel()));
             return;
         }
         log.info("{}.++channelInactive: {}. {}.", this.getClass().getSimpleName(), center.getCenterId(), center.getIpAddress());
@@ -106,7 +106,7 @@ public class ItsAsnServerPacketInboundHandler extends SimpleChannelInboundHandle
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
         CenterDto center = ApplicationRepository.getCenterObject(ctx.channel());
         if (center != null) {
-            log.error("{}.exceptionCaught: {}.", this.getClass().getSimpleName(), center.getCenterId());
+            log.error("{}.++exceptionCaught: {}.", this.getClass().getSimpleName(), center.getCenterId());
         }
         else {
             log.error("{}.++exceptionCaught: {}.", this.getClass().getSimpleName(), NettyUtils.getAddress(ctx.channel()));

+ 1 - 0
src/main/java/com/its/rota/server/xnet/server/process/request/AiInitialize.java

@@ -45,6 +45,7 @@ public class AiInitialize {
             result = false;
         }
         finally {
+            MDC.remove(center.getLogKey());
             MDC.clear();
         }
 

+ 5 - 4
src/main/java/com/its/rota/server/xnet/server/process/request/AiPublicationIncidentCondition.java

@@ -15,11 +15,11 @@ public class AiPublicationIncidentCondition {
 
     public static boolean run(CenterDto center) {
         boolean result;
+        IncidentConditionsList lists = center.getIncidentConditionsList();
+        if (lists.getIncidentConditions().isEmpty()) {
+            return true;
+        }
         try {
-            IncidentConditionsList lists = center.getIncidentConditionsList();
-            if (lists.getIncidentConditions().isEmpty()) {
-                return true;
-            }
             MDC.put("id", center.getLogKey());
             log.info("AiPublicationIncidentCondition.run: [{}, {}].", center.getLogKey(), center.getIpAddress());
 
@@ -68,6 +68,7 @@ public class AiPublicationIncidentCondition {
             result = false;
         }
         finally {
+            MDC.remove(center.getLogKey());
             MDC.clear();
         }
 

+ 5 - 4
src/main/java/com/its/rota/server/xnet/server/process/request/AiPublicationTraffic.java

@@ -15,11 +15,11 @@ public class AiPublicationTraffic {
 
     public static boolean run(CenterDto center) {
         boolean result;
+        CurrentLinkStateList lists = center.getCurrentLinkStateList();
+        if (lists.getCurrentLinkState().isEmpty()) {
+            return true;
+        }
         try {
-            CurrentLinkStateList lists = center.getCurrentLinkStateList();
-            if (lists.getCurrentLinkState().isEmpty()) {
-                return true;
-            }
             MDC.put("id", center.getLogKey());
             log.info("AiPublicationTraffic.run: [{}, {}].", center.getLogKey(), center.getIpAddress());
 
@@ -71,6 +71,7 @@ public class AiPublicationTraffic {
             result = false;
         }
         finally {
+            MDC.remove(center.getLogKey());
             MDC.clear();
         }
 

+ 1 - 0
src/main/java/com/its/rota/server/xnet/server/process/request/AiTerminate.java

@@ -44,6 +44,7 @@ public class AiTerminate {
             result = false;
         }
         finally {
+            MDC.remove(center.getLogKey());
             MDC.clear();
         }
         // 연결을 종료할 때 전송하는 메시지 이기 때문에 여기서 Channel 의 연결을 종료하면 안된다.

+ 1 - 0
src/main/java/com/its/rota/server/xnet/server/process/response/AcceptResponse.java

@@ -47,6 +47,7 @@ public class AcceptResponse implements ItsAsnResponse {
             result = false;
         }
         finally {
+            MDC.remove(center.getLogKey());
             MDC.clear();
         }
         return result;

+ 1 - 0
src/main/java/com/its/rota/server/xnet/server/process/response/FredResponse.java

@@ -54,6 +54,7 @@ public class FredResponse implements ItsAsnResponse {
             result = false;
         }
         finally {
+            MDC.remove(center.getLogKey());
             MDC.clear();
         }
         return result;

+ 1 - 0
src/main/java/com/its/rota/server/xnet/server/process/response/LoginResponse.java

@@ -125,6 +125,7 @@ public class LoginResponse implements ItsAsnResponse {
             result = false;
         }
         finally {
+            MDC.remove(center.getLogKey());
             MDC.clear();
         }
         return result;

+ 1 - 0
src/main/java/com/its/rota/server/xnet/server/process/response/LogoutResponse.java

@@ -29,6 +29,7 @@ public class LogoutResponse implements ItsAsnResponse {
             result = false;
         }
         finally {
+            MDC.remove(center.getLogKey());
             MDC.clear();
         }
         return result;

+ 1 - 0
src/main/java/com/its/rota/server/xnet/server/process/response/RejectResponse.java

@@ -56,6 +56,7 @@ public class RejectResponse implements ItsAsnResponse {
             result = false;
         }
         finally {
+            MDC.remove(center.getLogKey());
             MDC.clear();
         }
         return result;

+ 2 - 1
src/main/java/com/its/rota/server/xnet/server/process/response/SubscriptionResponse.java

@@ -30,7 +30,7 @@ public class SubscriptionResponse implements ItsAsnResponse {
             MDC.put("id", this.center.getLogKey());
             log.info("SubscriptionResponse.response: [{}, {}].", this.center.getLogKey(), this.center.getIpAddress());
 
-            int dataPacketNmbr = this.c2c.getDatexDataPacketNumber().intValue();
+//            int dataPacketNmbr = this.c2c.getDatexDataPacketNumber().intValue();
             int objectId = 0;
             C2CAuthenticatedMessage c2c = null;
             PDUs pdUs = this.c2c.getPdu();
@@ -99,6 +99,7 @@ public class SubscriptionResponse implements ItsAsnResponse {
             result = false;
         }
         finally {
+            MDC.remove(center.getLogKey());
             MDC.clear();
         }
         return result;

+ 1 - 0
src/main/java/com/its/rota/server/xnet/server/process/response/TerminateResponse.java

@@ -24,6 +24,7 @@ public class TerminateResponse implements ItsAsnResponse {
             ApplicationRepository.closeChannel(this.center, this.center.getNetState().getChannel());
         }
         finally {
+            MDC.remove(center.getLogKey());
             MDC.clear();
         }
         return true;

+ 2 - 2
src/main/java/com/its/rota/server/xnet/server/process/work/DataPacketWorker.java

@@ -73,7 +73,7 @@ public class DataPacketWorker extends AbstractAppWorker implements Runnable {
         boolean isError = false;
         RecvPacketDto packet = (RecvPacketDto)object;
         Channel channel = packet.getCenter().getNetState().getChannel();
-        CenterDto center = packet.getCenter();;
+        CenterDto center = packet.getCenter();
         C2CAuthenticatedMessage c2c = packet.getC2c();
         try {
             MDC.put("id", center.getLogKey());
@@ -111,7 +111,7 @@ public class DataPacketWorker extends AbstractAppWorker implements Runnable {
 
             if (response != null) {
                 if (!response.response()) {
-                    log.error("TcpServerDataProcess.process: [{}, {}]. response error. will be closed.", center.getLogKey(), center.getIpAddress());
+                    log.error("DataPacketWorker.process: [{}, {}]. response error. will be closed.", center.getLogKey(), center.getIpAddress());
                     isError = true;
                 }
             }