X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.detached%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fdetached%2FDetachedExecutionServerImpl.java;h=1a601310b309fdf99e22e979158671245f6874e3;hb=2c5e642009d14c2ca4faf74e8b137de478b237f0;hp=13d67947fbc9ba126ccf1cecbc285dda39427244;hpb=cf1adb6cbf016fe861e7b6952776081a0339c4d3;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java
index 13d67947f..1a601310b 100644
--- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java
+++ b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/DetachedExecutionServerImpl.java
@@ -1,80 +1,178 @@
 package org.argeo.slc.detached;
 
+import java.util.List;
+import java.util.Vector;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.detached.admin.CloseSession;
+import org.argeo.slc.detached.admin.OpenSession;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 
 public class DetachedExecutionServerImpl implements DetachedExecutionServer {
-	private final DetachedContextImpl detachedContext;
+	private final static Log log = LogFactory
+			.getLog(DetachedExecutionServerImpl.class);
 
-	private BundleContext bundleContext;
-	private DetachedDriver driver;
+	private final DetachedContextImpl detachedContext;
+	private final List sessions;
 
-	private boolean active = false;
+	private int skipCount = 0;
 
-	public void setDriver(DetachedDriver driver) {
-		this.driver = driver;
-	}
+	private BundleContext bundleContext;
 
 	public DetachedExecutionServerImpl() {
 		detachedContext = new DetachedContextImpl();
+		sessions = new Vector();
 	}
 
-	public DetachedAnswer executeStep(DetachedRequest request) {
+	public synchronized DetachedAnswer executeRequest(DetachedRequest request) {
+		DetachedAnswer answer = null;
 		try {
-			DetachedStep step = null;
-
-			// Find step
+			// Find action
 			ServiceReference[] refs = bundleContext.getAllServiceReferences(
 					StaticRefProvider.class.getName(), null);
+			Object obj = null;
 			for (int i = 0; i < refs.length; i++) {
 				StaticRefProvider provider = (StaticRefProvider) bundleContext
 						.getService(refs[i]);
-				Object obj = provider.getStaticRef(request.getRef());
+				obj = provider.getStaticRef(request.getRef());
 				if (obj != null) {
-					step = (DetachedStep) obj;
 					break;
 				}
 			}
 
-			if (step == null)
-				throw new DetachedException("Could not find step with ref "
+			if (obj == null)
+				throw new DetachedException("Could not find action with ref "
 						+ request.getRef());
 
-			return step.execute(detachedContext, request);
-		} catch (DetachedException e) {
-			throw e;
+			// Execute actions
+			if (obj instanceof DetachedStep) {
+				answer = processStep((DetachedStep) obj, request);
+
+			} else if (obj instanceof DetachedAdminCommand) {
+				answer = processAdminCommand((DetachedAdminCommand) obj,
+						request);
+			}
+
+			if (answer == null) {
+				throw new DetachedException("Unknown action type "
+						+ obj.getClass() + " for action with ref "
+						+ request.getRef());
+			}
 		} catch (Exception e) {
-			e.printStackTrace();
-			throw new DetachedException(
-					"Unexpected exception while executing request " + request,
-					e);
+			answer = new DetachedAnswer(request);
+			answer.setStatus(DetachedAnswer.ERROR);
+			answer.setLog(e.getMessage());
 		}
+		getCurrentSession().getRequests().add(request);
+		getCurrentSession().getAnswers().add(answer);
+		if (log.isDebugEnabled())
+			log.debug("Processed '" + request.getRef() + "' (status="
+					+ answer.getStatusAsString() + ", path="
+					+ request.getPath() + ")");
+		return answer;
 	}
 
-	public void init(BundleContext bundleContext) {
-		this.bundleContext = bundleContext;
-		Thread driverThread = new Thread(new Runnable() {
-
-			public void run() {
-				while (active) {
-					try {
-						DetachedRequest request = driver.receiveRequest();
-						DetachedAnswer answer = executeStep(request);
-						driver.sendAnswer(answer);
-					} catch (Exception e) {
-						if (e instanceof RuntimeException)
-							throw (RuntimeException) e;
-						else
-							e.printStackTrace();
+	protected DetachedAnswer processStep(DetachedStep obj,
+			DetachedRequest request) {
+		DetachedAnswer answer;
+		if (getCurrentSession() == null)
+			throw new DetachedException("No open session.");
+
+		StringBuffer skippedLog = new StringBuffer();
+		boolean execute = true;
+		if (getPreviousSession() != null && !getPreviousSession().isClosed()) {
+			if (getCurrentSession().getDoItAgainPolicy().equals(
+					DetachedSession.SKIP_UNTIL_ERROR)) {
+				// Skip execution of already successful steps
+				if (getPreviousSession().getAnswers().size() > skipCount) {
+					DetachedAnswer previousAnswer = (DetachedAnswer) getPreviousSession()
+							.getAnswers().get(skipCount);
+					DetachedRequest previousRequest = (DetachedRequest) getPreviousSession()
+							.getRequests().get(skipCount);
+					// Check paths
+					if (!previousRequest.getPath().equals(request.getPath())) {
+						String msg = "New request is not consistent with previous path. previousPath="
+								+ previousRequest.getPath()
+								+ ", newPath="
+								+ request.getPath() + "\n";
+						skippedLog.append(msg);
+						log.warn(msg);
 					}
+
+					if (previousAnswer.getStatus() != DetachedAnswer.ERROR) {
+						execute = false;
+					}
+				} else {
+					// went further as skip count, doing nothing.
 				}
+			}
+		}
+
+		if (execute) {
+			DetachedStep step = (DetachedStep) obj;
+			answer = step.execute(detachedContext, request);
+		} else {
+			skippedLog.append("Skipped path " + request.getPath()
+					+ " (skipCount=" + skipCount + ")");
+			answer = new DetachedAnswer(request);
+			answer.setStatus(DetachedAnswer.SKIPPED);
+			answer.setLog(skippedLog.toString());
+		}
+		return answer;
+	}
+
+	protected DetachedAnswer processAdminCommand(DetachedAdminCommand obj,
+			DetachedRequest request) {
+		DetachedAnswer answer;
+		if (obj instanceof OpenSession) {
+			if (getCurrentSession() != null)
+				throw new DetachedException(
+						"There is already an open session #"
+								+ getCurrentSession().getUuid());
+			sessions.add(((OpenSession) obj).execute(request, bundleContext));
+			answer = new DetachedAnswer(request, "Session #"
+					+ getCurrentSession().getUuid() + " open.");
+		} else if (obj instanceof CloseSession) {
+			if (getCurrentSession() == null)
+				throw new DetachedException("There is no open session to close");
+			answer = new DetachedAnswer(request, "Session #"
+					+ getCurrentSession().getUuid() + " closed.");
+			answer.setStatus(DetachedAnswer.CLOSED_SESSION);
+		} else {
+			answer = null;
+		}
+		return answer;
+	}
 
+	protected final DetachedSession getCurrentSession() {
+		if (sessions.size() == 0) {
+			return null;
+		} else {
+			DetachedSession session = (DetachedSession) sessions.get(sessions
+					.size() - 1);
+			List answers = session.getAnswers();
+			if (answers.size() > 0) {
+				DetachedAnswer lastAnswer = (DetachedAnswer) answers
+						.get(answers.size() - 1);
+				if (lastAnswer.getStatus() == DetachedAnswer.ERROR
+						|| lastAnswer.getStatus() == DetachedAnswer.CLOSED_SESSION)
+					return null;
 			}
-		}, "driverThread");
+			return session;
+		}
+	}
 
-		active = true;
+	protected final DetachedSession getPreviousSession() {
+		if (sessions.size() < 2)
+			return null;
+		else
+			return (DetachedSession) sessions.get(sessions.size() - 2);
+	}
 
-		driverThread.start();
+	public void init(BundleContext bundleContext) {
+		this.bundleContext = bundleContext;
 	}
 
 }