X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FProcessThread.java;h=3a184808e4fdd7fe347a53a0d97d7af23b629fb7;hb=a75c0516aca20f9a8c8fdd32feee402257ff2b61;hp=c11e875b8083df0d627c51dba32587360bdfed22;hpb=24d560ee846fda5d7954d44f83cb22ab449dbe61;p=gpl%2Fargeo-slc.git

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 c11e875b8..3a184808e 100644
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
@@ -27,10 +26,14 @@ 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.process.RealizedFlow;
+import org.argeo.slc.execution.ExecutionStep;
+import org.argeo.slc.execution.RealizedFlow;
 import org.argeo.slc.process.SlcExecution;
+import org.springframework.security.Authentication;
+import org.springframework.security.context.SecurityContextHolder;
 
 /** 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);
 
@@ -55,9 +58,22 @@ public class ProcessThread extends Thread {
 	}
 
 	public final void run() {
+		// authenticate thread
+		 Authentication authentication = getProcessThreadGroup()
+		 .getAuthentication();
+		 if (authentication == null)
+		 throw new SlcException("Can only execute authenticated threads");
+		 SecurityContextHolder.getContext().setAuthentication(authentication);
+
+		// log.info("\n##\n## SLC Process #" + process.getUuid() +
+		// " STARTED by "
+		// + authentication.getName() + "\n##\n");
 		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 +136,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 +185,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;
+			}
+		}
+
+	}
 }