X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FExecutionThread.java;h=9289c7f56f03acd98c8b3921775aa850a474fa88;hb=6de9c4036be9e318f59a0ffa187570f5999c53cb;hp=f1ebde364142d7db5cfa91085b7750d9ac208cd8;hpb=c092f2c4564f7238f2960bc005c5a2202732f44e;p=gpl%2Fargeo-slc.git

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 f1ebde364..9289c7f56 100644
--- 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
@@ -1,80 +1,123 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.SlcException;
 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;
+import org.argeo.slc.execution.ExecutionModulesManager;
+import org.argeo.slc.execution.ExecutionStep;
+import org.argeo.slc.execution.RealizedFlow;
+import org.springframework.security.Authentication;
+import org.springframework.security.context.SecurityContextHolder;
 
 /** 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 ExecutionModulesManager executionModulesManager;
 	private final RealizedFlow realizedFlow;
-	private final ProcessThread processThread;
 
-	public ExecutionThread(ProcessThread processThread,
+	private List<Runnable> destructionCallbacks = new ArrayList<Runnable>();
+
+	public ExecutionThread(ProcessThreadGroup processThreadGroup,
+			ExecutionModulesManager executionModulesManager,
 			RealizedFlow realizedFlow) {
-		super(processThread.getProcessThreadGroup(), "Flow "
+		super(processThreadGroup, "Flow "
 				+ realizedFlow.getFlowDescriptor().getName());
 		this.realizedFlow = realizedFlow;
-		this.processThread = processThread;
+		this.executionModulesManager = executionModulesManager;
 	}
 
 	public void run() {
-		if (getContextClassLoader() != null) {
-			if (log.isTraceEnabled())
-				log.debug("Context class loader set to "
-						+ getContextClassLoader());
-		}
+		// authenticate thread
+		Authentication authentication = getProcessThreadGroup()
+				.getAuthentication();
+		if (authentication == null)
+			throw new SlcException("Can only execute authenticated threads");
+		SecurityContextHolder.getContext().setAuthentication(authentication);
 
 		// Retrieve execution flow descriptor
 		ExecutionFlowDescriptor executionFlowDescriptor = realizedFlow
 				.getFlowDescriptor();
 		String flowName = executionFlowDescriptor.getName();
 
-		dispatchAddStep(processThread.getSlcProcess(), new SlcExecutionStep(
-				SlcExecutionStep.TYPE_PHASE_START, "Flow " + flowName));
+		getProcessThreadGroup().dispatchAddStep(
+				new ExecutionStep(realizedFlow.getModuleName(),
+						ExecutionStep.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);
+				executionModulesManager.upgrade(realizedFlow
+						.getModuleNameVersion());
+			executionModulesManager.start(realizedFlow.getModuleNameVersion());
+			//
+			// START FLOW
+			//
+			executionModulesManager.execute(realizedFlow);
+			// END FLOW
+		} catch (FlowConfigurationException e) {
+			String msg = "Configuration problem with flow " + flowName + ":\n"
+					+ e.getMessage();
+			log.error(msg);
+			getProcessThreadGroup().dispatchAddStep(
+					new ExecutionStep(realizedFlow.getModuleName(),
+							ExecutionStep.ERROR, msg + " " + e.getMessage()));
 		} 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()));
-			processThread.notifyError();
+			getProcessThreadGroup().dispatchAddStep(
+					new ExecutionStep(realizedFlow.getModuleName(),
+							ExecutionStep.ERROR, msg + " " + e.getMessage()));
 		} finally {
-			processThread.flowCompleted();
-			dispatchAddStep(processThread.getSlcProcess(),
-					new SlcExecutionStep(SlcExecutionStep.TYPE_PHASE_END,
-							"Flow " + flowName));
+			getProcessThreadGroup().dispatchAddStep(
+					new ExecutionStep(realizedFlow.getModuleName(),
+							ExecutionStep.PHASE_END, "Flow " + flowName));
+			processDestructionCallbacks();
 		}
 	}
 
-	protected void dispatchAddStep(SlcExecution slcExecution,
-			SlcExecutionStep step) {
-		slcExecution.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);
+	private synchronized void processDestructionCallbacks() {
+		for (int i = destructionCallbacks.size() - 1; i >= 0; i--) {
+			try {
+				destructionCallbacks.get(i).run();
+			} catch (Exception e) {
+				log.warn("Could not process destruction callback " + i
+						+ " in thread " + getName(), e);
+			}
 		}
 	}
-}
+
+	/**
+	 * Gather object destruction callback to be called in reverse order at the
+	 * end of the thread
+	 */
+	synchronized void registerDestructionCallback(String name, Runnable callback) {
+		destructionCallbacks.add(callback);
+	}
+
+	protected ProcessThreadGroup getProcessThreadGroup() {
+		return (ProcessThreadGroup) getThreadGroup();
+	}
+}
\ No newline at end of file