Print the workflowId at the end of "itools online-workflow-control".

Fixes #125
itesla · Dec 13, 2016 · f495fbf · f495fbf
1 parent d884f0e
commit f495fbf
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/online-workflow/src/main/java/eu/itesla_project/online/LocalOnlineApplication.java b/online-workflow/src/main/java/eu/itesla_project/online/LocalOnlineApplication.java
@@ -220,7 +220,7 @@ public int getAvailableCores() {
 
 
     @Override
-    public void startWorkflow(OnlineWorkflowStartParameters start, OnlineWorkflowParameters params) {
+    public String startWorkflow(OnlineWorkflowStartParameters start, OnlineWorkflowParameters params) {
 
         try {
             config = OnlineConfig.load();
@@ -267,14 +267,17 @@ public void startWorkflow(OnlineWorkflowStartParameters start, OnlineWorkflowPar
             e.printStackTrace();
             throw new RuntimeException(e);
         }
+        String wfId=null;
         try {
             workflow.start(oCtx);
+            wfId=workflow.getId();
         } catch (Exception e) {
             throw new RuntimeException(e);
         } finally {
             workflowLock.unlock();
             workflow = null;
         }
+        return wfId;
     }
 
     @Override

diff --git a/online-workflow/src/main/java/eu/itesla_project/online/LocalOnlineApplicationMBean.java b/online-workflow/src/main/java/eu/itesla_project/online/LocalOnlineApplicationMBean.java
@@ -45,7 +45,7 @@ public interface LocalOnlineApplicationMBean {
 
     int[] getBusyCores();
 
-    void startWorkflow(OnlineWorkflowStartParameters start, OnlineWorkflowParameters params);
+    String startWorkflow(OnlineWorkflowStartParameters start, OnlineWorkflowParameters params);
 
     void stopWorkflow();
 

diff --git a/online-workflow/src/main/java/eu/itesla_project/online/OnlineApplication.java b/online-workflow/src/main/java/eu/itesla_project/online/OnlineApplication.java
@@ -16,7 +16,7 @@ public interface OnlineApplication extends AutoCloseable {
 
     int getAvailableCores();
 
-    void startWorkflow(OnlineWorkflowStartParameters start, OnlineWorkflowParameters params);
+    String startWorkflow(OnlineWorkflowStartParameters start, OnlineWorkflowParameters params);
 
     void stopWorkflow();
 

diff --git a/online-workflow/src/main/java/eu/itesla_project/online/RemoteOnlineApplication.java b/online-workflow/src/main/java/eu/itesla_project/online/RemoteOnlineApplication.java
@@ -183,13 +183,14 @@ public int getAvailableCores() {
 
 
     @Override
-    public void startWorkflow(OnlineWorkflowStartParameters start, OnlineWorkflowParameters params) {
+    public String startWorkflow(OnlineWorkflowStartParameters start, OnlineWorkflowParameters params) {
         try {
-            application.startWorkflow(start, params);
+            return application.startWorkflow(start, params);
         } catch (Exception e) {
             LOGGER.error(e.getMessage(),e);
             notifyDisconnection();
         }
+        return null;
     }
 
     @Override

diff --git a/online-workflow/src/main/java/eu/itesla_project/online/tools/OnlineWorkflowTool.java b/online-workflow/src/main/java/eu/itesla_project/online/tools/OnlineWorkflowTool.java
@@ -194,13 +194,15 @@ public void run(CommandLine line) throws Exception {
         if (line.hasOption(OnlineWorkflowCommand.START_CMD)) {
             if (params.getCaseFile() != null) {
                 System.out.println("starting Online Workflow, caseFile " + params.getCaseFile());
-                application.startWorkflow(startconfig, params);
+                String workflowId=application.startWorkflow(startconfig, params);
+                System.out.println("workflowId="+workflowId);
 
             } else {
                 for (DateTime basecase : baseCasesSet) {
                     params.setBaseCaseDate(basecase);
                     System.out.println("starting Online Workflow, basecase " + basecase.toString());
-                    application.startWorkflow(startconfig, params);
+                    String workflowId=application.startWorkflow(startconfig, params);
+                    System.out.println("workflowId="+workflowId);
                 }
             }
         } else if (line.hasOption(OnlineWorkflowCommand.SHUTDOWN_CMD)) {