This is an automated email from the ASF dual-hosted git repository.
jinyleechina pushed a commit to branch 2.0.6-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/2.0.6-prepare by this push:
new 367b29b710 [Cherry-pick] fix pick error (#10755)
367b29b710 is described below
commit 367b29b7104594bab8d4df3f0799bf6377b5d03b
Author: JinYong Li <[email protected]>
AuthorDate: Mon Jul 4 11:34:35 2022 +0800
[Cherry-pick] fix pick error (#10755)
* issue 8645 (#8811)
Co-authored-by: 北笙 <“[email protected]”>
Co-authored-by: zhanqian <[email protected]>
* [fix-8929][DAO]Description Failed to upload the file because the full
name was too long (#9020)
* [fix-8929][DAO]Description Failed to upload the file because the full
name was too long
* [DS-#8929][fix]Description Failed to upload the file because the full
name was too long
* [DS-#8929][fix]Description Failed to upload the file because the full
name was too long
* [DS-#8929][fix]Description Failed to upload the file because the full
name was too long
Co-authored-by: houshuai <[email protected]>
* [BUG][ALERT-SERVER]validate script before alert script (#9834)
* validate script before alert script
* fix validate script before alert script
* pick 8811/9020/9834
* fix ut
* fix pick error
Co-authored-by: zhanqian <[email protected]>
Co-authored-by: 北笙 <“[email protected]”>
Co-authored-by: zhanqian <[email protected]>
Co-authored-by: shuai hou <[email protected]>
Co-authored-by: houshuai <[email protected]>
Co-authored-by: Tq <[email protected]>
Co-authored-by: JinyLeeChina <[email protected]>
---
.../org/apache/dolphinscheduler/plugin/alert/script/ScriptSender.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptSender.java
b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptSender.java
index 0d422f279b..2791fc1d96 100644
---
a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptSender.java
+++
b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptSender.java
@@ -57,13 +57,13 @@ public final class ScriptSender {
File shellScriptFile = new File(scriptPath);
//validate existence
if (!shellScriptFile.exists()) {
- logger.error("shell script not exist : {}", scriptPath);
+ log.error("shell script not exist : {}", scriptPath);
alertResult.setMessage("shell script not exist : " + scriptPath);
return alertResult;
}
//validate is file
if (!shellScriptFile.isFile()) {
- logger.error("shell script is not a file : {}", scriptPath);
+ log.error("shell script is not a file : {}", scriptPath);
alertResult.setMessage("shell script is not a file : " +
scriptPath);
return alertResult;
}
