Improve If

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / execution / ProcessThread.java

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java
index c11e875b8083df0d627c51dba32587360bdfed22..b116696f16ee15a2227db219f7e7ca54622a265e 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java
@@ -27,10 +27,12 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionProcess;
+import org.argeo.slc.execution.ExecutionStep;
 import org.argeo.slc.process.RealizedFlow;
 import org.argeo.slc.process.SlcExecution;
 
 /** Thread of the SLC Process, starting the sub executions. */
+@SuppressWarnings("deprecation")
 public class ProcessThread extends Thread {
        private final static Log log = LogFactory.getLog(ProcessThread.class);
 
@@ -58,6 +60,9 @@ public class ProcessThread extends Thread {
                log.info("\n##\n## SLC Process #" + process.getUuid()
                                + " STARTED\n##\n");
 
+               // Start logging
+               new LoggingThread().start();
+
                String oldStatus = process.getStatus();
                process.setStatus(ExecutionProcess.RUNNING);
                executionModulesManager.dispatchUpdateStatus(process, oldStatus,
@@ -120,7 +125,6 @@ public class ProcessThread extends Thread {
         * Implementation specific execution. To be overridden in order to deal with
         * custom process types. Default expects an {@link SlcExecution}.
         */
-       @SuppressWarnings("deprecation")
        protected void process() throws InterruptedException {
                if (!(process instanceof SlcExecution))
                        throw new SlcException("Unsupported process type "
@@ -170,4 +174,34 @@ public class ProcessThread extends Thread {
        public ExecutionModulesManager getExecutionModulesManager() {
                return executionModulesManager;
        }
+
+       private class LoggingThread extends Thread {
+
+               public LoggingThread() {
+                       super("SLC Process Logger #" + process.getUuid());
+               }
+
+               public void run() {
+                       boolean run = true;
+                       while (run) {
+                               List<ExecutionStep> newSteps = new ArrayList<ExecutionStep>();
+                               processThreadGroup.getSteps().drainTo(newSteps);
+                               if (newSteps.size() > 0) {
+                                       // System.out.println(steps.size() + " steps");
+                                       process.addSteps(newSteps);
+                               }
+
+                               try {
+                                       Thread.sleep(1000);
+                               } catch (InterruptedException e) {
+                                       break;
+                               }
+
+                               if (!ProcessThread.this.isAlive()
+                                               && processThreadGroup.getSteps().size() == 0)
+                                       run = false;
+                       }
+               }
+
+       }
 }