fix: rydder alle mdc nøkler før hver kjøring. kopierer til error task (…

…#56)
navikt · May 31, 2020 · a086263 · a086263
1 parent bdbe497
commit a086263
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/IdentRunnableTask.java b/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/IdentRunnableTask.java
@@ -2,6 +2,8 @@
 
 import java.time.LocalDateTime;
 
+import org.slf4j.MDC;
+
 /** IdentRunnable som tar id og Runnable. */
 class IdentRunnableTask implements IdentRunnable {
     private final Long id;
@@ -16,6 +18,7 @@ class IdentRunnableTask implements IdentRunnable {
 
     @Override
     public void run() {
+        MDC.clear();
         runnable.run();
     }
 

diff --git a/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/TaskManagerRunnableTask.java b/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/TaskManagerRunnableTask.java
@@ -25,6 +25,7 @@ class TaskManagerRunnableTask implements Runnable {
 
     @Override
     public void run() {
+        MDC.clear();
 
         RunTask runSingleTask = newRunTaskInstance();
         IdentRunnable errorCallback = null;
@@ -45,15 +46,16 @@ public void run() {
             clearLogContext();
             // dispose CDI etter bruk
             TaskManagerGenerateRunnableTasks.CURRENT.destroy(runSingleTask);
-
             // kjør etter at runTask er destroyed og logcontext renset
             handleErrorCallback(errorCallback);
         }
     }
 
     IdentRunnable lagErrorCallback(final RunTaskInfo taskInfo, final String callId, final Throwable fatal) {
         Runnable errorCallback;
+        var mdcCopy = MDC.getCopyOfContextMap();
         errorCallback = () -> {
+            MDC.setContextMap(mdcCopy); // later som vi fortsetter med samme MDC nøkler, men nå i ny tråd
             final FatalErrorTask errorTask = TaskManagerGenerateRunnableTasks.CURRENT.select(FatalErrorTask.class).get();
             try {
                 initLogContext(callId, taskInfo.getTaskType());
@@ -76,8 +78,7 @@ IdentRunnable lagErrorCallback(final RunTaskInfo taskInfo, final String callId,
     }
 
     void clearLogContext() {
-        TaskManagerGenerateRunnableTasks.LOG_CONTEXT.clear();
-        MDC.remove(CallId.CALL_ID);
+        MDC.clear();
     }
 
     void initLogContext(final String callId, String taskName) {