diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java index 3dbc99f..8b945a6 100644 --- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java +++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/LogMdcConfiguration.java @@ -27,10 +27,6 @@ public class LogMdcConfiguration { @PostConstruct public void contextOperatorHook() { Hooks.onEachOperator(PRINT_LOG_ID, Operators.lift((r, c) ->{ - /*Context ctx = c.currentContext(); - if(ctx.hasKey(PRINT_LOG_ID)){ - MDC.put(PRINT_LOG_ID, ctx.get(PRINT_LOG_ID)); - }*/ return new MdcContextSubscriber(c); })); } @@ -69,9 +65,8 @@ public class LogMdcConfiguration { @Override public void onNext(T t) { - Context ctx = currentContext(); - if(ctx.hasKey(PRINT_LOG_ID)){ - MDC.put(PRINT_LOG_ID, ctx.get(PRINT_LOG_ID)); + if(currentContext().hasKey(PRINT_LOG_ID)){ + MDC.put(PRINT_LOG_ID, currentContext().get(PRINT_LOG_ID)); } coreSubscriber.onNext(t); } diff --git a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/filter/LogMdcConfiguration.java b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/filter/LogMdcConfiguration.java index 89154ab..396d1f4 100644 --- a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/filter/LogMdcConfiguration.java +++ b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/filter/LogMdcConfiguration.java @@ -26,10 +26,6 @@ public class LogMdcConfiguration { @PostConstruct public void contextOperatorHook() { Hooks.onEachOperator(PRINT_LOG_ID, Operators.lift((r, c) ->{ - Context ctx = c.currentContext(); - if(ctx.hasKey(PRINT_LOG_ID)){ - MDC.put(PRINT_LOG_ID, ctx.get(PRINT_LOG_ID)); - } return new MdcContextSubscriber(c); })); } @@ -69,7 +65,9 @@ public class LogMdcConfiguration { @Override public void onNext(T t) { - + if(coreSubscriber.currentContext().hasKey(PRINT_LOG_ID)){ + MDC.put(PRINT_LOG_ID, coreSubscriber.currentContext().get(PRINT_LOG_ID)); + } coreSubscriber.onNext(t); }