add parent to logging pipeline, fixes apache#4690

hansva · Dec 10, 2024 · 6c546ff · 6c546ff
1 parent 18df953
commit 6c546ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/...eflection/src/main/java/org/apache/hop/reflection/pipeline/xp/PipelineStartLoggingXp.java b/...eflection/src/main/java/org/apache/hop/reflection/pipeline/xp/PipelineStartLoggingXp.java
@@ -227,6 +227,9 @@ private synchronized void executeLoggingPipeline(
     LocalPipelineEngine loggingPipeline =
         new LocalPipelineEngine(loggingPipelineMeta, variables, pipeline);
 
+    // Link logged pipeline as parent
+    loggingPipeline.setParentPipeline(pipeline);
+
     // Flag it as a logging pipeline so we don't log ourselves...
     //
     loggingPipeline.getExtensionDataMap().put(PIPELINE_LOGGING_FLAG, "Y");

diff --git a/...eflection/src/main/java/org/apache/hop/reflection/workflow/xp/WorkflowStartLoggingXp.java b/...eflection/src/main/java/org/apache/hop/reflection/workflow/xp/WorkflowStartLoggingXp.java
@@ -191,6 +191,9 @@ private synchronized void executeLoggingPipeline(
     LocalPipelineEngine loggingPipeline =
         new LocalPipelineEngine(loggingPipelineMeta, variables, workflow);
 
+    // Linked logged workflow as parent
+    loggingPipeline.setParentWorkflow(workflow);
+
     // Flag it as a logging pipeline so we don't log ourselves...
     //
     loggingPipeline.getExtensionDataMap().put(PipelineStartLoggingXp.PIPELINE_LOGGING_FLAG, "Y");

diff --git a/plugins/misc/testing/src/main/java/org/apache/hop/testing/gui/TestingGuiPlugin.java b/plugins/misc/testing/src/main/java/org/apache/hop/testing/gui/TestingGuiPlugin.java
@@ -1207,7 +1207,7 @@ public static final Map<String, Object> getStateMap(PipelineMeta pipelineMeta) {
   public static final PipelineUnitTest getCurrentUnitTest(PipelineMeta pipelineMeta) {
     // When rendering a pipeline on a server status page we never have a current unit test
     //
-    if ("Server".equalsIgnoreCase(Const.getHopPlatformRuntime())) {
+    if (!"GUI".equalsIgnoreCase(Const.getHopPlatformRuntime())) {
       return null;
     }
     Map<String, Object> stateMap = getStateMap(pipelineMeta);