Skip to content

Commit d73cc99

Browse files
authored
Merge pull request #4691 from hansva/main
add parent to logging pipeline, fixes #4690
2 parents 18df953 + 6c546ff commit d73cc99

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

plugins/misc/reflection/src/main/java/org/apache/hop/reflection/pipeline/xp/PipelineStartLoggingXp.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ private synchronized void executeLoggingPipeline(
227227
LocalPipelineEngine loggingPipeline =
228228
new LocalPipelineEngine(loggingPipelineMeta, variables, pipeline);
229229

230+
// Link logged pipeline as parent
231+
loggingPipeline.setParentPipeline(pipeline);
232+
230233
// Flag it as a logging pipeline so we don't log ourselves...
231234
//
232235
loggingPipeline.getExtensionDataMap().put(PIPELINE_LOGGING_FLAG, "Y");

plugins/misc/reflection/src/main/java/org/apache/hop/reflection/workflow/xp/WorkflowStartLoggingXp.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@ private synchronized void executeLoggingPipeline(
191191
LocalPipelineEngine loggingPipeline =
192192
new LocalPipelineEngine(loggingPipelineMeta, variables, workflow);
193193

194+
// Linked logged workflow as parent
195+
loggingPipeline.setParentWorkflow(workflow);
196+
194197
// Flag it as a logging pipeline so we don't log ourselves...
195198
//
196199
loggingPipeline.getExtensionDataMap().put(PipelineStartLoggingXp.PIPELINE_LOGGING_FLAG, "Y");

plugins/misc/testing/src/main/java/org/apache/hop/testing/gui/TestingGuiPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,7 @@ public static final Map<String, Object> getStateMap(PipelineMeta pipelineMeta) {
12071207
public static final PipelineUnitTest getCurrentUnitTest(PipelineMeta pipelineMeta) {
12081208
// When rendering a pipeline on a server status page we never have a current unit test
12091209
//
1210-
if ("Server".equalsIgnoreCase(Const.getHopPlatformRuntime())) {
1210+
if (!"GUI".equalsIgnoreCase(Const.getHopPlatformRuntime())) {
12111211
return null;
12121212
}
12131213
Map<String, Object> stateMap = getStateMap(pipelineMeta);

0 commit comments

Comments
 (0)