Revert "Use logback instead of log4j to fix logging issues"

This reverts commit 49dc13a.

jar.properties

@@ -30,8 +30,8 @@ slf4j-api.jar=lib/slf4j-api-1.7.6.jar
 slf4j-api.src=lib/slf4j-api-1.7.6-sources.jar
 slf4j-log4j.jar=lib/slf4j-log4j12-1.7.6.jar
 slf4j-log4j.src=lib/slf4j-log4j12-1.7.6-sources.jar
-logback-classic.jar=lib/logback-classic-1.1.2.jar
-logback-core.jar=lib/logback-core-1.1.2.jar
+logback-classic.jar=lib/logback-classic-1.1.1.jar
+logback-core.jar=lib/logback-core-1.1.1.jar
 sweetened.jar=lib/sweetened.jar
 velocity.jar=lib/velocity-1.7.jar
 velocity.src=lib/velocity-1.7-sources.jar

jmxtrans.sh

@@ -17,7 +17,7 @@ fi
 
 JAVA_HOME=${JAVA_HOME:-"/usr"}
 LOG_DIR=${LOG_DIR:-"."}
-STDOUT_REDIRECT_FILE=${STDOUT_REDIRECT_FILE:-"/dev/null"}
+LOG_FILE=${LOG_FILE:-"/dev/null"}
 
 JAR_FILE=${JAR_FILE:-"jmxtrans-all.jar"}
 ADDITIONAL_JARS=${ADDITIONAL_JARS:-""}
@@ -91,7 +91,7 @@ start() {
         EXEC=${EXEC:-"-jar $JAR_FILE -e -f $FILENAME -s $SECONDS_BETWEEN_RUNS -c $CONTINUE_ON_ERROR -a $ADDITIONAL_JARS"}
     fi
 
-    nohup $JAVA -server $JAVA_OPTS $JMXTRANS_OPTS $GC_OPTS $MONITOR_OPTS $EXEC >>$STDOUT_REDIRECT_FILE 2>&1 &
+    nohup $JAVA -server $JAVA_OPTS $JMXTRANS_OPTS $GC_OPTS $MONITOR_OPTS $EXEC >>$LOG_FILE 2>&1 &
 
     if [ ! -z "$PIDFILE" ]; then
         echo $! > "$PIDFILE"

pom.xml

@@ -367,7 +367,7 @@
 			<resource>
 				<directory>src</directory>
 				<includes>
-				  <include>logback.xml</include>
+					<include>log4j.xml</include>
 					<include>quartz.server.properties</include>
 				</includes>
 			</resource>

src/log4j.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+    <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="[%d{dd MMM yyyy HH:mm:ss}] %-6r %-5p (%C:%L) - %m\n"/>
+        </layout>
+    </appender>
+
+    <appender name="asyncAppender" class="org.apache.log4j.AsyncAppender">
+        <param name="BufferSize" value="1024" />
+        <param name="Blocking" value="true" />
+        <!-- needed to get the class:linenumber output
+             @see http://marc.info/?l=log4j-user&m=105591790712092&w=2 -->
+        <param name="LocationInfo" value="true"/>
+        <appender-ref ref="fileAppender" />
+    </appender>
+
+    <appender name="fileAppender" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="${jmxtrans.log.dir}/jmxtrans.log"/>
+        <param name="Append" value="true"/>
+        <param name="DatePattern" value="'.'yyyyMMdd"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="[%d{dd MMM yyyy HH:mm:ss}] [%t] %-6r %-5p (%C:%L) - %m\n"/>
+        </layout>
+    </appender>
+
+    <logger name="com.googlecode.jmxtrans">
+        <level value="${jmxtrans.log.level}"/>
+    </logger>
+
+    <logger name="org.quartz">
+        <level value="warn"/>
+    </logger>
+
+    <root>
+        <level value="error"/>
+        <appender-ref ref="asyncAppender"/>
+    </root>
+
+</log4j:configuration>