Minimal Hello World execution module

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

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 cdafe446d9a33727307ec9019049aad1893e1e94..e9c3c481c68fd65269e5b0885a1df35b03e57433 100644 (file)
--- 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
@@ -47,16 +47,12 @@ 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);
                }
        }
@@ -89,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,