Add log4j support

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java
index 08dfca28b7df73eea616c779e07caa436bce7734..c81e8b1a0d64eecfa2b13bd5a2a3349d1024ed2a 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java
@@ -8,12 +8,13 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.process.RealizedFlow;
-import org.argeo.slc.process.SlcExecution;
 import org.argeo.slc.process.SlcExecutionNotifier;
 import org.argeo.slc.process.SlcExecutionStep;
 
 /** Thread of a single execution */
 public class ExecutionThread extends Thread {
+       public final static String SYSPROP_EXECUTION_AUTO_UPGRADE = "slc.execution.autoupgrade";
+
        private final static Log log = LogFactory.getLog(ExecutionThread.class);
 
        private final RealizedFlow realizedFlow;
@@ -28,38 +29,48 @@ public class ExecutionThread extends Thread {
        }
 
        public void run() {
+               if (getContextClassLoader() != null) {
+                       if (log.isTraceEnabled())
+                               log.debug("Context class loader set to "
+                                               + getContextClassLoader());
+               }
+
+               // Retrieve execution flow descriptor
                ExecutionFlowDescriptor executionFlowDescriptor = realizedFlow
                                .getFlowDescriptor();
                String flowName = executionFlowDescriptor.getName();
 
-               dispatchAddStep(processThread.getSlcProcess(), new SlcExecutionStep(
-                               SlcExecutionStep.TYPE_PHASE_START, "Flow " + flowName));
+               dispatchAddStep(new SlcExecutionStep(SlcExecutionStep.TYPE_PHASE_START,
+                               "Flow " + flowName));
 
                try {
+                       String autoUpgrade = System
+                                       .getProperty(SYSPROP_EXECUTION_AUTO_UPGRADE);
+                       if (autoUpgrade != null && autoUpgrade.equals("true"))
+                               processThread.getExecutionModulesManager().upgrade(
+                                               realizedFlow.getModuleNameVersion());
                        processThread.getExecutionModulesManager().execute(realizedFlow);
                } catch (Exception e) {
                        // TODO: re-throw exception ?
                        String msg = "Execution of flow " + flowName + " failed.";
                        log.error(msg, e);
-                       dispatchAddStep(processThread.getSlcProcess(),
-                                       new SlcExecutionStep(msg + " " + e.getMessage()));
+                       dispatchAddStep(new SlcExecutionStep(msg + " " + e.getMessage()));
+                       processThread.notifyError();
                } finally {
                        processThread.flowCompleted();
-                       dispatchAddStep(processThread.getSlcProcess(),
-                                       new SlcExecutionStep(SlcExecutionStep.TYPE_PHASE_END,
-                                                       "Flow " + flowName));
+                       dispatchAddStep(new SlcExecutionStep(
+                                       SlcExecutionStep.TYPE_PHASE_END, "Flow " + flowName));
                }
        }
 
-       protected void dispatchAddStep(SlcExecution slcExecution,
-                       SlcExecutionStep step) {
-               slcExecution.getSteps().add(step);
+       public void dispatchAddStep(SlcExecutionStep step) {
+               processThread.getSlcProcess().getSteps().add(step);
                List<SlcExecutionStep> steps = new ArrayList<SlcExecutionStep>();
                steps.add(step);
                for (Iterator<SlcExecutionNotifier> it = processThread
                                .getExecutionModulesManager().getSlcExecutionNotifiers()
                                .iterator(); it.hasNext();) {
-                       it.next().addSteps(slcExecution, steps);
+                       it.next().addSteps(processThread.getSlcProcess(), steps);
                }
        }