SLC Unit

[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 880aefef1f51b27e3a4a7100e6407629495bc018..190a0b69661863ec83a188177992dd76f95f9877 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
@@ -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,26 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.argeo.slc.log4j;
 
 import java.util.Date;
+import java.util.concurrent.BlockingQueue;
 
 import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.Layout;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-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.execution.ExecutionStep;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
 
 /** Not meant to be used directly in standard log4j config */
-public class SlcExecutionAppender extends AppenderSkeleton implements
-               InitializingBean, DisposableBean {
+public class SlcExecutionAppender extends AppenderSkeleton {
 
        private Boolean disabled = false;
 
@@ -49,15 +44,15 @@ public class SlcExecutionAppender extends AppenderSkeleton implements
                }
        };
 
-       private Layout layout = null;
-       private String pattern = "%m - %c%n";
+       // private Layout layout = null;
+       // private String pattern = "%m - %c%n";
        private Boolean onlyExecutionThread = false;
 
-       public void afterPropertiesSet() {
-               if (layout != null)
-                       setLayout(layout);
-               else
-                       setLayout(new PatternLayout(pattern));
+       public void init() {
+               // if (layout != null)
+               // setLayout(layout);
+               // else
+               // setLayout(new PatternLayout(pattern));
                Logger.getRootLogger().addAppender(this);
        }
 
@@ -87,6 +82,7 @@ public class SlcExecutionAppender extends AppenderSkeleton implements
                        }
                }
 
+               // Check whether we are within an executing process
                Thread currentThread = Thread.currentThread();
                if (currentThread.getThreadGroup() instanceof ProcessThreadGroup) {
                        if (onlyExecutionThread
@@ -108,13 +104,22 @@ public class SlcExecutionAppender extends AppenderSkeleton implements
                        else
                                type = ExecutionStep.INFO;
 
-                       ExecutionStep step = new ExecutionStep(new Date(
-                                       event.getTimeStamp()), type, layout.format(event));
+                       ExecutionStep step = new ExecutionStep(event.getLoggerName(),
+                                       new Date(event.getTimeStamp()), type, event.getMessage()
+                                                       .toString());
 
                        try {
                                dispatching.set(true);
-                               ((ProcessThreadGroup) currentThread.getThreadGroup())
-                                               .dispatchAddStep(step);
+                               BlockingQueue<ExecutionStep> steps = ((ProcessThreadGroup) currentThread
+                                               .getThreadGroup()).getSteps();
+                               if (steps.remainingCapacity() == 0) {
+                                       stdOut("WARNING: execution steps queue is full, skipping step: "
+                                                       + step);
+                                       // FIXME understand why it block indefinitely: the queue
+                                       // should be emptied by the logging thread
+                               } else {
+                                       steps.add(step);
+                               }
                        } finally {
                                dispatching.set(false);
                        }
@@ -132,14 +137,19 @@ public class SlcExecutionAppender extends AppenderSkeleton implements
                return false;
        }
 
-       public void setLayout(Layout layout) {
-               this.layout = layout;
-       }
+       // public void setLayout(Layout layout) {
+       // this.layout = layout;
+       // }
 
-       public void setPattern(String pattern) {
-               this.pattern = pattern;
+       /** For development purpose, since using regular logging is not easy here */
+       static void stdOut(Object obj) {
+               System.out.println(obj);
        }
 
+       // public void setPattern(String pattern) {
+       // this.pattern = pattern;
+       // }
+
        public void setOnlyExecutionThread(Boolean onlyExecutionThread) {
                this.onlyExecutionThread = onlyExecutionThread;
        }