Do not set wfid/wftype to MDC in parent process on async execution

openxpki · Jan 18, 2021 · fff84e0 · fff84e0
1 parent 57279cd
commit fff84e0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/core/server/OpenXPKI/Server/API2/Plugin/Workflow/Util.pm b/core/server/OpenXPKI/Server/API2/Plugin/Workflow/Util.pm
@@ -105,9 +105,6 @@ sub execute_activity {
     my ($self, $wf, $activity, $async, $wait) = @_;
     ##! 2: 'execute activity ' . $activity
 
-    Log::Log4perl::MDC->put('wfid', $wf->id());
-    Log::Log4perl::MDC->put('wftype', $wf->type());
-
     # ASYNCHRONOUS - fork
     if ($async) {
         $self->_execute_activity_async($wf, $activity); # returns the background process PID
@@ -120,6 +117,10 @@ sub execute_activity {
     }
     # SYNCHRONOUS
     else {
+
+        Log::Log4perl::MDC->put('wfid', $wf->id());
+        Log::Log4perl::MDC->put('wftype', $wf->type());
+
         $self->_execute_activity_sync($wf, $activity); # modifies the $workflow object (and so $updated_workflow)
         return $wf;
     }
@@ -244,6 +245,9 @@ sub _execute_activity_async {
         return $pid;
     }
 
+    Log::Log4perl::MDC->put('wfid', $workflow->id());
+    Log::Log4perl::MDC->put('wftype', $workflow->type());
+
     # child process
     try {
         ##! 16: ' Workflow instance succesfully forked - I am the workflow'