You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by mc...@apache.org on 2022/03/01 07:30:50 UTC
[hop] branch master updated: HOP-3736 Remember the "Log level" of the last run.
This is an automated email from the ASF dual-hosted git repository.
mcasters pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 6d4ed24 HOP-3736 Remember the "Log level" of the last run.
new 7b8baf8 Merge pull request #1403 from gvdutra/HOP-3736
6d4ed24 is described below
commit 6d4ed241cba23124b3888b1393c0193b2dd1619e
Author: Gabriel Dutra <gv...@gmail.com>
AuthorDate: Mon Feb 28 22:42:34 2022 -0800
HOP-3736 Remember the "Log level" of the last run.
---
.../org/apache/hop/ui/core/dialog/ConfigurationDialog.java | 2 ++
.../dialog/PipelineExecutionConfigurationDialog.java | 13 ++++++++-----
.../dialog/WorkflowExecutionConfigurationDialog.java | 13 +++++++++----
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ui/src/main/java/org/apache/hop/ui/core/dialog/ConfigurationDialog.java b/ui/src/main/java/org/apache/hop/ui/core/dialog/ConfigurationDialog.java
index 08d3c0c..1a151eb 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/dialog/ConfigurationDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/dialog/ConfigurationDialog.java
@@ -71,6 +71,8 @@ public abstract class ConfigurationDialog extends Dialog {
protected HopGui hopGui;
+ public static final String LOG_LEVEL = "LOG_LEVEL";
+
public ConfigurationDialog(
Shell parent, IExecutionConfiguration configuration, AbstractMeta meta) {
super(parent);
diff --git a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineExecutionConfigurationDialog.java b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineExecutionConfigurationDialog.java
index 7289e43..3b7bd53 100644
--- a/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineExecutionConfigurationDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/pipeline/dialog/PipelineExecutionConfigurationDialog.java
@@ -192,12 +192,12 @@ public class PipelineExecutionConfigurationDialog extends ConfigurationDialog {
hopGui.getLog().logError("Unable to obtain a list of pipeline run configurations", e);
}
+ Map<String, String> pipelineUsageMap = null;
String lastGlobalRunConfig =
AuditManagerGuiUtil.getLastUsedValue(AUDIT_LIST_TYPE_LAST_USED_RUN_CONFIGURATIONS);
String lastPipelineRunConfig = null;
if (StringUtils.isNotEmpty(abstractMeta.getName())) {
- Map<String, String> pipelineUsageMap =
- AuditManagerGuiUtil.getUsageMap(MAP_TYPE_PIPELINE_RUN_CONFIG_USAGE);
+ pipelineUsageMap = AuditManagerGuiUtil.getUsageMap(MAP_TYPE_PIPELINE_RUN_CONFIG_USAGE);
lastPipelineRunConfig = pipelineUsageMap.get(abstractMeta.getName());
}
@@ -251,8 +251,11 @@ public class PipelineExecutionConfigurationDialog extends ConfigurationDialog {
}
}
- wLogLevel.select(configuration.getLogLevel().getLevel());
-
+ if (pipelineUsageMap != null && pipelineUsageMap.containsKey(LOG_LEVEL)) {
+ wLogLevel.select(Integer.parseInt(pipelineUsageMap.get(LOG_LEVEL)));
+ } else {
+ wLogLevel.select(configuration.getLogLevel().getLevel());
+}
getParamsData();
getVariablesData();
}
@@ -306,9 +309,9 @@ public class PipelineExecutionConfigurationDialog extends ConfigurationDialog {
Map<String, String> usageMap =
AuditManagerGuiUtil.getUsageMap(MAP_TYPE_PIPELINE_RUN_CONFIG_USAGE);
usageMap.put(abstractMeta.getName(), runConfigurationName);
+ usageMap.put("LOG_LEVEL", String.valueOf(wLogLevel.getSelectionIndex()));
AuditManagerGuiUtil.saveUsageMap(MAP_TYPE_PIPELINE_RUN_CONFIG_USAGE, usageMap);
}
-
configuration.setClearingLog(wClearLog.getSelection());
configuration.setLogLevel(LogLevel.values()[wLogLevel.getSelectionIndex()]);
diff --git a/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java b/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java
index ba90dd1..35ffb93 100644
--- a/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java
+++ b/ui/src/main/java/org/apache/hop/ui/workflow/dialog/WorkflowExecutionConfigurationDialog.java
@@ -22,7 +22,6 @@ import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.extension.ExtensionPointHandler;
import org.apache.hop.core.extension.HopExtensionPoint;
-import org.apache.hop.core.logging.DefaultLogLevel;
import org.apache.hop.core.logging.LogLevel;
import org.apache.hop.core.util.StringUtil;
import org.apache.hop.core.util.Utils;
@@ -215,7 +214,6 @@ public class WorkflowExecutionConfigurationDialog extends ConfigurationDialog {
public void getData() {
wClearLog.setSelection(configuration.isClearingLog());
- wLogLevel.select(DefaultLogLevel.getLogLevel().getLevel());
try {
wRunConfiguration.fillItems();
@@ -227,12 +225,12 @@ public class WorkflowExecutionConfigurationDialog extends ConfigurationDialog {
hopGui.getLog().logError("Unable to obtain a list of workflow run configurations", e);
}
+ Map<String, String> workflowUsageMap = null;
String lastGlobalRunConfig =
AuditManagerGuiUtil.getLastUsedValue(AUDIT_LIST_TYPE_LAST_USED_RUN_CONFIGURATIONS);
String lastWorkflowRunConfig = null;
if (StringUtils.isNotEmpty(abstractMeta.getName())) {
- Map<String, String> workflowUsageMap =
- AuditManagerGuiUtil.getUsageMap(MAP_TYPE_WORKFLOW_RUN_CONFIG_USAGE);
+ workflowUsageMap = AuditManagerGuiUtil.getUsageMap(MAP_TYPE_WORKFLOW_RUN_CONFIG_USAGE);
lastWorkflowRunConfig = workflowUsageMap.get(abstractMeta.getName());
}
@@ -289,6 +287,12 @@ public class WorkflowExecutionConfigurationDialog extends ConfigurationDialog {
}
wStartAction.setText(startAction);
+ if (workflowUsageMap != null && workflowUsageMap.containsKey(LOG_LEVEL)) {
+ wLogLevel.select(Integer.parseInt(workflowUsageMap.get(LOG_LEVEL)));
+ } else {
+ wLogLevel.select(configuration.getLogLevel().getLevel());
+ }
+
getParamsData();
getVariablesData();
}
@@ -342,6 +346,7 @@ public class WorkflowExecutionConfigurationDialog extends ConfigurationDialog {
Map<String, String> usageMap =
AuditManagerGuiUtil.getUsageMap(MAP_TYPE_WORKFLOW_RUN_CONFIG_USAGE);
usageMap.put(abstractMeta.getName(), runConfigurationName);
+ usageMap.put("LOG_LEVEL", String.valueOf(wLogLevel.getSelectionIndex()));
AuditManagerGuiUtil.saveUsageMap(MAP_TYPE_WORKFLOW_RUN_CONFIG_USAGE, usageMap);
}