Improve logging

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.simple / src / main / java / org / argeo / slc / log4j / SlcExecutionAppender.java

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/log4j/SlcExecutionAppender.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/log4j/SlcExecutionAppender.java
index 997b6d04510e62e6ffa1f5c4ed2f8e22b6819996..880aefef1f51b27e3a4a7100e6407629495bc018 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/log4j/SlcExecutionAppender.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/log4j/SlcExecutionAppender.java
@@ -26,7 +26,7 @@ import org.apache.log4j.PatternLayout;
 import org.apache.log4j.spi.LoggingEvent;
 import org.argeo.slc.core.execution.ExecutionThread;
 import org.argeo.slc.core.execution.ProcessThreadGroup;
-import org.argeo.slc.process.SlcExecutionStep;
+import org.argeo.slc.execution.ExecutionStep;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 
@@ -34,9 +34,24 @@ import org.springframework.beans.factory.InitializingBean;
 public class SlcExecutionAppender extends AppenderSkeleton implements
                InitializingBean, DisposableBean {
 
+       private Boolean disabled = false;
+
+       private String level = null;
+
+       private Level log4jLevel = null;
+
+       /** Marker to prevent stack overflow */
+       private ThreadLocal<Boolean> dispatching = new ThreadLocal<Boolean>() {
+
+               @Override
+               protected Boolean initialValue() {
+                       return false;
+               }
+       };
+
        private Layout layout = null;
        private String pattern = "%m - %c%n";
-       private Boolean onlyExecutionThread = true;
+       private Boolean onlyExecutionThread = false;
 
        public void afterPropertiesSet() {
                if (layout != null)
@@ -48,32 +63,61 @@ public class SlcExecutionAppender extends AppenderSkeleton implements
 
        @Override
        protected void append(LoggingEvent event) {
+               if (disabled)
+                       return;
+
+               if (dispatching.get())
+                       return;
+
+               if (level != null && !level.trim().equals("")) {
+                       if (log4jLevel == null || !log4jLevel.toString().equals(level))
+                               try {
+                                       log4jLevel = Level.toLevel(level);
+                               } catch (Exception e) {
+                                       System.err
+                                                       .println("Log4j level could not be set for level '"
+                                                                       + level + "', resetting it to null.");
+                                       e.printStackTrace();
+                                       level = null;
+                               }
+
+                       if (log4jLevel != null
+                                       && !event.getLevel().isGreaterOrEqual(log4jLevel)) {
+                               return;
+                       }
+               }
+
                Thread currentThread = Thread.currentThread();
                if (currentThread.getThreadGroup() instanceof ProcessThreadGroup) {
                        if (onlyExecutionThread
                                        && !(currentThread instanceof ExecutionThread))
                                return;
-                       
+
                        final String type;
                        if (event.getLevel().equals(Level.ERROR)
                                        || event.getLevel().equals(Level.FATAL))
-                               type = SlcExecutionStep.ERROR;
+                               type = ExecutionStep.ERROR;
                        else if (event.getLevel().equals(Level.WARN))
-                               type = SlcExecutionStep.WARNING;
+                               type = ExecutionStep.WARNING;
                        else if (event.getLevel().equals(Level.INFO))
-                               type = SlcExecutionStep.INFO;
+                               type = ExecutionStep.INFO;
                        else if (event.getLevel().equals(Level.DEBUG))
-                               type = SlcExecutionStep.DEBUG;
+                               type = ExecutionStep.DEBUG;
                        else if (event.getLevel().equals(Level.TRACE))
-                               type = SlcExecutionStep.TRACE;
+                               type = ExecutionStep.TRACE;
                        else
-                               type = SlcExecutionStep.INFO;
-
-                       SlcExecutionStep step = new SlcExecutionStep(new Date(event
-                                       .getTimeStamp()), type, layout.format(event));
-
-                       ((ProcessThreadGroup) currentThread.getThreadGroup())
-                                       .dispatchAddStep(step);
+                               type = ExecutionStep.INFO;
+
+                       ExecutionStep step = new ExecutionStep(new Date(
+                                       event.getTimeStamp()), type, layout.format(event));
+
+                       try {
+                               dispatching.set(true);
+                               ((ProcessThreadGroup) currentThread.getThreadGroup())
+                                               .dispatchAddStep(step);
+                       } finally {
+                               dispatching.set(false);
+                       }
                }
        }
 
@@ -100,4 +144,12 @@ public class SlcExecutionAppender extends AppenderSkeleton implements
                this.onlyExecutionThread = onlyExecutionThread;
        }
 
+       public void setDisabled(Boolean disabled) {
+               this.disabled = disabled;
+       }
+
+       public void setLevel(String level) {
+               this.level = level;
+       }
+
 }