X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FExecutionAspect.java;h=e9c3c481c68fd65269e5b0885a1df35b03e57433;hb=32f9566efa0d0ce29b31ee0779faf2b42f46321a;hp=e9e5b4cddd89967d62724500b61aaec332dfa24d;hpb=30f4c6af6c20077e5e36b61faf5edb22c1aae6c6;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
index e9e5b4cdd..e9c3c481c 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
@@ -27,6 +27,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 
 @Aspect
+/** Aspect intercepting calls on execution flows and contexts. */
 public class ExecutionAspect {
 	private final static Log log = LogFactory.getLog(ExecutionAspect.class);
 
@@ -46,30 +47,16 @@ public class ExecutionAspect {
 		executionContext.setVariable(ExecutionContext.VAR_FLOW_NAME,
 				executionFlow.getName());
 
-		if (log.isDebugEnabled())
-			logStackEvent("=> ", executionFlow);
-
+		logStackEvent("=> ", executionFlow, false);
 		try {
 			// Actually execute the flow
 			pjp.proceed();
 		} finally {
-			if (log.isDebugEnabled())
-				logStackEvent("<= ", executionFlow);
-
+			logStackEvent("<= ", executionFlow, true);
 			executionStack.leaveFlow(executionFlow);
 		}
 	}
 
-	@Around("runnableExecution()")
-	public void aroundRunnable(ProceedingJoinPoint pjp) throws Throwable {
-		ExecutionFlow executionFlow = (ExecutionFlow) pjp.getTarget();
-		Runnable runnable = (Runnable) pjp.getArgs()[0];
-		if (log.isDebugEnabled())
-			logRunnableExecution(executionFlow, runnable);
-		// Actually execute the runnable
-		pjp.proceed();
-	}
-
 	@Around("getVariable()")
 	public Object aroundGetVariable(ProceedingJoinPoint pjp) throws Throwable {
 		Object obj = pjp.proceed();
@@ -86,10 +73,6 @@ public class ExecutionAspect {
 	public void flowExecution() {
 	}
 
-	@Pointcut("execution(void org.argeo.slc.execution.ExecutionFlow.doExecuteRunnable(..))")
-	public void runnableExecution() {
-	}
-
 	@Pointcut("execution(* org.argeo.slc.execution.ExecutionContext.getVariable(..))")
 	public void getVariable() {
 	}
@@ -102,14 +85,18 @@ public class ExecutionAspect {
 		this.executionContext = executionContext;
 	}
 
-	protected void logStackEvent(String symbol, ExecutionFlow executionFlow) {
+	protected void logStackEvent(String symbol, ExecutionFlow executionFlow,
+			Boolean trace) {
 		Integer stackSize = executionStack.getStackSize();
 		if (log.isTraceEnabled())
 			log.debug(depthSpaces(stackSize) + symbol + executionFlow + " #"
 					+ executionStack.getCurrentStackLevelUuid() + ", depth="
 					+ stackSize);
-		else if (log.isDebugEnabled())
+		else if (log.isDebugEnabled() && !trace)
 			log.debug(depthSpaces(stackSize) + symbol + executionFlow);
+		else if (log.isTraceEnabled() && trace)
+			log.trace(depthSpaces(stackSize) + symbol + executionFlow);
+
 	}
 
 	protected void logRunnableExecution(ExecutionFlow executionFlow,