X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Flog4j%2FSlcExecutionAppender.java;h=4193fd925ba9c85c144cef6e60cde0af5efc1d01;hb=dfd48f8dbae521182038fe82ee172e486b676fd9;hp=85d3e677c5853cff649d01f11cbced95ecdee2ec;hpb=6926b1fc72b36a5d8ec188a4981665fb7554a7d9;p=gpl%2Fargeo-slc.git

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 85d3e677c..4193fd925 100644
--- 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,11 +1,31 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.log4j;
 
+import java.util.Date;
+
 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.process.SlcExecutionStep;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
@@ -14,8 +34,18 @@ import org.springframework.beans.factory.InitializingBean;
 public class SlcExecutionAppender extends AppenderSkeleton implements
 		InitializingBean, DisposableBean {
 
+	/** 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 = false;
 
 	public void afterPropertiesSet() {
 		if (layout != null)
@@ -27,13 +57,41 @@ public class SlcExecutionAppender extends AppenderSkeleton implements
 
 	@Override
 	protected void append(LoggingEvent event) {
-		if (!(Thread.currentThread() instanceof ExecutionThread))
+		if (dispatching.get())
 			return;
 
-		ExecutionThread executionThread = (ExecutionThread) Thread
-				.currentThread();
-		executionThread.dispatchAddStep(new SlcExecutionStep(layout
-				.format(event)));
+		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;
+			else if (event.getLevel().equals(Level.WARN))
+				type = SlcExecutionStep.WARNING;
+			else if (event.getLevel().equals(Level.INFO))
+				type = SlcExecutionStep.INFO;
+			else if (event.getLevel().equals(Level.DEBUG))
+				type = SlcExecutionStep.DEBUG;
+			else if (event.getLevel().equals(Level.TRACE))
+				type = SlcExecutionStep.TRACE;
+			else
+				type = SlcExecutionStep.INFO;
+
+			SlcExecutionStep step = new SlcExecutionStep(new Date(event
+					.getTimeStamp()), type, layout.format(event));
+
+			try {
+				dispatching.set(true);
+				((ProcessThreadGroup) currentThread.getThreadGroup())
+						.dispatchAddStep(step);
+			} finally {
+				dispatching.set(false);
+			}
+		}
 	}
 
 	public void destroy() throws Exception {
@@ -55,4 +113,8 @@ public class SlcExecutionAppender extends AppenderSkeleton implements
 		this.pattern = pattern;
 	}
 
+	public void setOnlyExecutionThread(Boolean onlyExecutionThread) {
+		this.onlyExecutionThread = onlyExecutionThread;
+	}
+
 }