Skip to content

Commit

Permalink
Unify logging system
Browse files Browse the repository at this point in the history
- Use slf4j-log4j12
- Use INFO level by default
- While on it, bump slf4j-log4j12 to the latest version
  • Loading branch information
jwendell committed Jan 31, 2017
1 parent b0eee03 commit 60190c0
Show file tree
Hide file tree
Showing 19 changed files with 73 additions and 19 deletions.
1 change: 0 additions & 1 deletion amq/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>

<dependency>
Expand Down
15 changes: 12 additions & 3 deletions amq/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@

#Root Logger
log4j.rootLogger=INFO, stdout
#Log to Console as STDOUT
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n
#Log to file FILE
log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
log4j.appender.file.File=logfile.log
log4j.appender.file.DatePattern='.'yyyy-MM-dd
log4j.appender.file.append=true
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n

#Root Logger
log4j.rootLogger=INFO, stdout

log4j.logger.org.apache.http.wire=INFO
2 changes: 1 addition & 1 deletion deprecated/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion eap/compat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>

Expand Down
5 changes: 5 additions & 0 deletions eap/eap64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
<artifactId>jboss-logging</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>

<!-- Test Utils -->

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion eap/eap64/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n

#Root Logger
log4j.rootLogger=TRACE, stdout
log4j.rootLogger=INFO, stdout

log4j.logger.org.apache.http.wire=INFO
5 changes: 5 additions & 0 deletions eap/eap70/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
<artifactId>jboss-logging</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>

<!-- Test Utils -->

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion eap/eap70/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n

#Root Logger
log4j.rootLogger=TRACE, stdout
log4j.rootLogger=INFO, stdout

log4j.logger.org.apache.http.wire=INFO
5 changes: 5 additions & 0 deletions jdg/jdg65/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
<artifactId>jboss-logging</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdg/jdg65/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n

#Root Logger
log4j.rootLogger=TRACE, stdout
log4j.rootLogger=INFO, stdout

log4j.logger.org.apache.http.wire=INFO
5 changes: 5 additions & 0 deletions kieserver/62/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
<artifactId>jboss-logging</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion kieserver/62/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n

#Root Logger
log4j.rootLogger=TRACE, stdout
log4j.rootLogger=INFO, stdout

log4j.logger.org.apache.http.wire=INFO
5 changes: 5 additions & 0 deletions kieserver/63/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@
<artifactId>httpclient</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>

<!-- Test Utils -->

Expand Down Expand Up @@ -107,6 +111,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>

</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion kieserver/63/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n

#Root Logger
log4j.rootLogger=TRACE, stdout
log4j.rootLogger=INFO, stdout

log4j.logger.org.apache.http.wire=INFO
8 changes: 1 addition & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<org.jboss.bom.version>7.0.0.GA</org.jboss.bom.version>
<version.junit>4.12</version.junit>
<version.javax.servlet.api>3.1.0</version.javax.servlet.api>
<version.slf4j>1.7.5</version.slf4j>
<version.slf4j>1.7.22</version.slf4j>
<version.org.jboss.as.arquillian.container>7.2.0.Final</version.org.jboss.as.arquillian.container>
<version.jolokia>1.3.4</version.jolokia>
<version.json>20160212</version.json>
Expand Down Expand Up @@ -285,12 +285,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${version.slf4j}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions spark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
<artifactId>jboss-logging</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand Down
17 changes: 17 additions & 0 deletions spark/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#Log to Console as STDOUT
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n
#Log to file FILE
log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
log4j.appender.file.File=logfile.log
log4j.appender.file.DatePattern='.'yyyy-MM-dd
log4j.appender.file.append=true
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n

#Root Logger
log4j.rootLogger=INFO, stdout

log4j.logger.org.apache.http.wire=INFO
5 changes: 5 additions & 0 deletions webserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
<artifactId>jboss-logging</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>

<!-- Test Utils -->

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion webserver/src/test/resources/log4j.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %3x - %m%n

#Root Logger
log4j.rootLogger=TRACE, stdout
log4j.rootLogger=INFO, stdout

log4j.logger.org.apache.http.wire=TRACE

0 comments on commit 60190c0

Please sign in to comment.