Merge pull request #4 from SpazioDati/armisael-patch-2

Armisael patch 2
SpazioDati · Feb 6, 2017 · b18a2c6 · b18a2c6
2 parents 9e3c706 + 7d7da2c
commit b18a2c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>eu-spaziodati</groupId>
     <artifactId>azkaban-plugins-groovy</artifactId>
     <packaging>jar</packaging>
-    <version>0.4.14</version>
+    <version>0.4.15</version>
     <description>A set of plugins for Azkaban workflow manager to run jobs as groovy scripts</description>
     <url>https://github.com/SpazioDati/azkaban-groovy-plugin</url>
     <properties>

diff --git a/src/main/groovy/eu/spaziodati/azkaban/jobtype/ScriptHelper.groovy b/src/main/groovy/eu/spaziodati/azkaban/jobtype/ScriptHelper.groovy
@@ -165,6 +165,10 @@ public class ScriptHelper {
             myFlowid = jobrunner.getNode().getParentFlow().getFlowId()
         }
 
+        this.onfinishFlow(myFlowid, c)
+    }
+
+    def onfinishFlow (String flowId, Closure c) {
         EventListener listener = new EventListener() {
             def done = false
             public void handleEvent(Event event) {
@@ -174,7 +178,7 @@ public class ScriptHelper {
                     if (event.data &&
                             event.data instanceof ExecutableFlowBase &&
                             // to match nested flows
-                            (event.data as ExecutableFlowBase).nestedId.equals(myFlowid) &&
+                            (event.data as ExecutableFlowBase).nestedId.equals(flowId) &&
                             event.runner instanceof FlowRunner) {
 
                         try {