You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2022/07/20 08:45:35 UTC
[hop] branch master updated: HOP-3921: log as error when needed
This is an automated email from the ASF dual-hosted git repository.
hansva 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 94e918044d HOP-3921: log as error when needed
new b8ad16e660 Merge pull request #1602 from hansva/master
94e918044d is described below
commit 94e918044d16e58a58bf12d0b2b31e096d15909b
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Wed Jul 20 10:15:40 2022 +0200
HOP-3921: log as error when needed
---
.../main/java/org/apache/hop/workflow/actions/abort/ActionAbort.java | 1 +
.../hop/workflow/actions/abort/messages/messages_en_US.properties | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbort.java b/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbort.java
index 98c12ccba3..fd4c96f5fc 100644
--- a/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbort.java
+++ b/plugins/actions/abort/src/main/java/org/apache/hop/workflow/actions/abort/ActionAbort.java
@@ -88,6 +88,7 @@ public class ActionAbort extends ActionBase implements Cloneable, IAction {
if (isAlwaysLogRows()) {
logMinimal(BaseMessages.getString(PKG, "ActionAbort.Log.Wrote.Row", nr, msg));
} else {
+ logError(BaseMessages.getString(PKG, "ActionAbort.Log.Wrote.Row", nr, msg));
result.setNrErrors(1);
result.setResult(false);
}
diff --git a/plugins/actions/abort/src/main/resources/org/apache/hop/workflow/actions/abort/messages/messages_en_US.properties b/plugins/actions/abort/src/main/resources/org/apache/hop/workflow/actions/abort/messages/messages_en_US.properties
index 01cef2876f..97f5adb474 100644
--- a/plugins/actions/abort/src/main/resources/org/apache/hop/workflow/actions/abort/messages/messages_en_US.properties
+++ b/plugins/actions/abort/src/main/resources/org/apache/hop/workflow/actions/abort/messages/messages_en_US.properties
@@ -27,7 +27,7 @@ ActionAbortDialog.ActionName.Label=Action name
ActionAbortDialog.Label=Abort workflow
ActionAbortDialog.MessageAbort.Label=Message\:
ActionAbortDialog.MessageAbort.Tooltip=Message to display in the log
-ActionAbortDialog.AlwaysLogRows.Label=Always log rows
+ActionAbortDialog.AlwaysLogRows.Label=Do not mark as error
ActionAbortDialog.AlwaysLogRows.Tooltip=Always log rows even if below current log level
ActionAbortDialog.MessageLogLevels.Label=Log level of the message:
ActionAbortDialog.Title=Abort workflow
\ No newline at end of file