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=880aefef1f51b27e3a4a7100e6407629495bc018;hb=0e2ff188c2e8ffac85739cccc3925e8bd82d7be9;hp=e14a1f24f58922e7b61979694f679969aa87c0ce;hpb=17ffc9fdb8f3a490881e540db8ff81655308233e;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 e14a1f24f..880aefef1 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,13 +1,32 @@
+/*
+ * 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.argeo.slc.execution.ExecutionStep;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 
@@ -15,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)
@@ -29,13 +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;
-			((ProcessThreadGroup) currentThread.getThreadGroup())
-					.dispatchAddStep(new SlcExecutionStep(layout.format(event)));
+
+			final String type;
+			if (event.getLevel().equals(Level.ERROR)
+					|| event.getLevel().equals(Level.FATAL))
+				type = ExecutionStep.ERROR;
+			else if (event.getLevel().equals(Level.WARN))
+				type = ExecutionStep.WARNING;
+			else if (event.getLevel().equals(Level.INFO))
+				type = ExecutionStep.INFO;
+			else if (event.getLevel().equals(Level.DEBUG))
+				type = ExecutionStep.DEBUG;
+			else if (event.getLevel().equals(Level.TRACE))
+				type = ExecutionStep.TRACE;
+			else
+				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);
+			}
 		}
 	}
 
@@ -62,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;
+	}
+
 }