fix(log): ensure executionId is cleaned up from MDC (#1685)

spinnaker · Oct 12, 2017 · 622452b · 622452b
1 parent 8ba231e
commit 622452b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/QueueProcessor.kt b/orca-queue/src/main/kotlin/com/netflix/spinnaker/orca/q/QueueProcessor.kt
@@ -67,6 +67,8 @@ class QueueProcessor(
               log.warn("Executor at capacity, immediately re-queuing message", e)
               queue.push(message)
               registry.counter(pollRejectedMessage).increment()
+            } finally {
+              MDC.remove(SPINNAKER_EXECUTION_ID)
             }
           } else {
             registry.counter(pollErrorRateId).increment()