Merge pull request apache#4360 from nadment/4358

Pipeline Log is logging preview apache#4358
hansva · Sep 25, 2024 · 10a1a82 · 10a1a82
2 parents 3d46c53 + 26c5598
commit 10a1a82
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/engine/src/main/java/org/apache/hop/pipeline/Pipeline.java b/engine/src/main/java/org/apache/hop/pipeline/Pipeline.java
@@ -2469,6 +2469,7 @@ public void resumeExecution() {
    * @return true if the pipeline is being previewed, false otherwise
    */
   @Override
+  @Deprecated(since = "2.10")
   public boolean isPreview() {
     return preview;
   }
@@ -2479,6 +2480,7 @@ public boolean isPreview() {
    * @param preview true if the pipeline is being previewed, false otherwise
    */
   @Override
+  @Deprecated(since = "2.10")
   public void setPreview(boolean preview) {
     this.preview = preview;
   }

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
@@ -61,8 +61,7 @@ public void callExtensionPoint(ILogChannel log, IVariables variables, Pipeline p
 
     // Is the pipeline doing a preview?  We don't want to log in that case.
     //
-    String previewVariable = pipeline.getVariable(IPipelineEngine.PIPELINE_IN_PREVIEW_MODE, "N");
-    if (Const.toBoolean(previewVariable)) {
+    if (pipeline.getVariableBoolean(IPipelineEngine.PIPELINE_IN_PREVIEW_MODE, false)) {
       return;
     }
 

diff --git a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelinePreviewProgressDialog.java b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelinePreviewProgressDialog.java
@@ -31,6 +31,7 @@
 import org.apache.hop.pipeline.PipelineMeta;
 import org.apache.hop.pipeline.debug.PipelineDebugMeta;
 import org.apache.hop.pipeline.debug.TransformDebugMeta;
+import org.apache.hop.pipeline.engine.IPipelineEngine;
 import org.apache.hop.pipeline.engines.local.LocalPipelineEngine;
 import org.apache.hop.pipeline.transform.TransformMeta;
 import org.apache.hop.ui.core.dialog.ErrorDialog;
@@ -152,6 +153,7 @@ private void doPreview(
     //
     pipeline = new LocalPipelineEngine(pipelineMeta, variables, hopGui.getLoggingObject());
     pipeline.setPreview(true);
+    pipeline.setVariable(IPipelineEngine.PIPELINE_IN_PREVIEW_MODE, "Y");
     pipeline.setMetadataProvider(hopGui.getMetadataProvider());
 
     // Prepare the execution...