浏览代码

enhancement #I5P263 脚本执行异常,出现异常的处理

everywhere.z 2 年之前
父节点
当前提交
ba6a2c01b3

+ 1 - 1
liteflow-core/src/main/java/com/yomahub/liteflow/script/ScriptExecutor.java

@@ -11,7 +11,7 @@ public interface ScriptExecutor {
 
     void load(String nodeId, String script);
 
-    Object execute(ScriptExecuteWrap wrap);
+    Object execute(ScriptExecuteWrap wrap) throws Exception;
 
     void cleanCache();
 }

+ 2 - 3
liteflow-script-plugin/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java

@@ -50,7 +50,7 @@ public class GroovyScriptExecutor implements ScriptExecutor {
     }
 
     @Override
-    public Object execute(ScriptExecuteWrap wrap) {
+    public Object execute(ScriptExecuteWrap wrap) throws Exception{
         try{
             if (!compiledScriptMap.containsKey(wrap.getNodeId())){
                 String errorMsg = StrUtil.format("script for node[{}] is not loaded", wrap.getNodeId());
@@ -91,8 +91,7 @@ public class GroovyScriptExecutor implements ScriptExecutor {
             return compiledScript.eval(bindings);
         }catch (Exception e){
             log.error(e.getMessage(), e);
-            String errorMsg = StrUtil.format("script execute error for node[{}]", wrap.getNodeId());
-            throw new ScriptExecuteException(errorMsg);
+            throw e;
         }
     }
 

+ 2 - 3
liteflow-script-plugin/liteflow-script-javascript/src/main/java/com/yomahub/liteflow/script/javascript/JavaScriptExecutor.java

@@ -51,7 +51,7 @@ public class JavaScriptExecutor implements ScriptExecutor {
     }
 
     @Override
-    public Object execute(ScriptExecuteWrap wrap) {
+    public Object execute(ScriptExecuteWrap wrap) throws Exception{
         try{
             if (!compiledScriptMap.containsKey(wrap.getNodeId())){
                 String errorMsg = StrUtil.format("script for node[{}] is not loaded", wrap.getNodeId());
@@ -92,8 +92,7 @@ public class JavaScriptExecutor implements ScriptExecutor {
             return compiledScript.eval(bindings);
         }catch (Exception e){
             log.error(e.getMessage(), e);
-            String errorMsg = StrUtil.format("script execute error for node[{}]", wrap.getNodeId());
-            throw new ScriptExecuteException(errorMsg);
+            throw e;
         }
     }