Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

adding logback + slf4j logging #507

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions model/api/pom.xml
Expand Up @@ -42,6 +42,18 @@
<groupId>net.iharder</groupId>
<artifactId>base64</artifactId>
</dependency>

<!-- LOGGING -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.0</version>
</dependency>

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

</dependencies>

Expand Down
Expand Up @@ -16,8 +16,8 @@
*/
package org.jboss.aerogear.unifiedpush.utils;

import java.util.logging.Level;
import java.util.logging.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Responsible for Logging on UPS and prevent log forgery
Expand All @@ -37,7 +37,7 @@ private final static class SingletonHolder {
}

public static AeroGearLogger getInstance(Class clazz) {
AeroGearLogger.logger = Logger.getLogger(clazz.getSimpleName());
AeroGearLogger.logger = LoggerFactory.getLogger(clazz);
return SingletonHolder.instance;
}

Expand All @@ -46,23 +46,23 @@ public void info(String message){
}

public void warning(String message){
AeroGearLogger.logger.log(Level.WARNING, format(message));
AeroGearLogger.logger.warn(format(message));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just wondering, w/ slf4j do we still need the custom format() ? I hope/think that's done by the slf4j logging library

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes ... it is true .. I changed it

}

public void severe(String message){
AeroGearLogger.logger.log(Level.SEVERE, format(message));
AeroGearLogger.logger.error(format(message));
}

public void severe(String message, Throwable t){
AeroGearLogger.logger.log(Level.SEVERE, format(message), t);
AeroGearLogger.logger.error(format(message), t);
}

public void fine(String message){
AeroGearLogger.logger.log(Level.FINE, format(message));
AeroGearLogger.logger.trace("[FINE] " + format(message));
}

public void finest(String message){
AeroGearLogger.logger.log(Level.FINEST, format(message));
AeroGearLogger.logger.trace("[FINEST] " + format(message));
}

/**
Expand Down
6 changes: 0 additions & 6 deletions servers/ups-as7/pom.xml
Expand Up @@ -133,12 +133,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
Expand Down
56 changes: 56 additions & 0 deletions servers/ups-as7/src/main/resources/logback.xml
@@ -0,0 +1,56 @@
<configuration>
<jmxConfigurator />
<appender name="FILE"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/AeroGear/AeroGear.log</file>
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n
</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- roll per day -->
<fileNamePattern>logs/AeroGear/AeroGear.%d{yyyy-MM-dd}.%i.log
</fileNamePattern>
<!-- remove files older than 30 days -->
<maxHistory>30</maxHistory>
<!-- or whenever the file size reaches 100MB -->
<timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
</appender>
<appender name="SYSLOG" class="ch.qos.logback.classic.net.SyslogAppender">
<syslogHost>localhost</syslogHost>
<facility>USER</facility>
<suffixPattern>%msg</suffixPattern>
</appender>
<appender name="ERRFILE"
class="ch.qos.logback.core.FileAppender">
<file>logs/AeroGear/AeroGear.err</file>
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n
</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<logger name="org.springframework" level="ERROR" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@IvanGurtler ok if we get rid of the springframework here ? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry it was copy and paste :)

<logger name="org.hibernate" level="ERROR" />
<logger name="org.jboss.aerogear" level="TRACE" />
<logger name="syslog" level="INFO" additivity="false">
<appender-ref ref="SYSLOG" />
</logger>


<root level="INFO">
<!-- <appender-ref ref="SYSLOG" /> -->
<appender-ref ref="FILE" />
</root>
<root level="ERROR">
<appender-ref ref="ERRFILE" />
</root>
</configuration>
Expand Up @@ -7,6 +7,11 @@
<module name="org.jboss.xnio"/>
</dependencies>
<exclusions>
<module name="org.apache.commons.logging" />
<module name="org.slf4j" />
<module name="org.slf4j.ext" />
<module name="org.slf4j.impl" />
<module name="org.apache.log4j" />
</exclusions>
</deployment>
</jboss-deployment-structure>
6 changes: 0 additions & 6 deletions servers/ups-wildfly/pom.xml
Expand Up @@ -133,12 +133,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
Expand Down
56 changes: 56 additions & 0 deletions servers/ups-wildfly/src/main/resources/logback.xml
@@ -0,0 +1,56 @@
<configuration>
<jmxConfigurator />
<appender name="FILE"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/AeroGear/AeroGear.log</file>
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n
</pattern>
</encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- roll per day -->
<fileNamePattern>logs/AeroGear/AeroGear.%d{yyyy-MM-dd}.%i.log
</fileNamePattern>
<!-- remove files older than 30 days -->
<maxHistory>30</maxHistory>
<!-- or whenever the file size reaches 100MB -->
<timeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
</appender>
<appender name="SYSLOG" class="ch.qos.logback.classic.net.SyslogAppender">
<syslogHost>localhost</syslogHost>
<facility>USER</facility>
<suffixPattern>%msg</suffixPattern>
</appender>
<appender name="ERRFILE"
class="ch.qos.logback.core.FileAppender">
<file>logs/AeroGear/AeroGear.err</file>
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n
</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<logger name="org.springframework" level="ERROR" />
<logger name="org.hibernate" level="ERROR" />
<logger name="org.jboss.aerogear" level="TRACE" />
<logger name="syslog" level="INFO" additivity="false">
<appender-ref ref="SYSLOG" />
</logger>


<root level="INFO">
<!-- <appender-ref ref="SYSLOG" /> -->
<appender-ref ref="FILE" />
</root>
<root level="ERROR">
<appender-ref ref="ERRFILE" />
</root>
</configuration>
Expand Up @@ -6,7 +6,15 @@
<module name="org.jboss.xnio"/>
</dependencies>
<exclusions>
<module name="org.jboss.resteasy.resteasy-jackson2-provider" />
<module name="org.jboss.resteasy.resteasy-jackson2-provider" />
<module name="org.apache.commons.logging" />
<module name="org.apache.log4j" />
<module name="org.jboss.logging" />
<module name="org.jboss.logging.jul-to-slf4j-stub" />
<module name="org.jboss.logmanager" />
<module name="org.jboss.logmanager.log4j" />
<module name="org.slf4j" />
<module name="org.slf4j.impl" />
</exclusions>
</deployment>
</jboss-deployment-structure>