Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge ca2ac25 into 72c0dc7
  • Loading branch information
arturambroziak committed Feb 27, 2013
2 parents 72c0dc7 + ca2ac25 commit feedfac
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 41 deletions.
Expand Up @@ -18,7 +18,7 @@
*/
public class CachedJobStorage implements IJobStorage {

private static Logger logger = Logger.getLogger(CachedJobStorage.class.getName());
private static Logger logger = Logger.getLogger(CachedJobStorage.class);

protected IJobStorage cachedJobStorage;
protected LoadingCache<String, Optional<Job>> cache;
Expand Down
Expand Up @@ -52,8 +52,6 @@
*
*/
public class JSONUtils {
private static final Logger logger = Logger.getLogger("troia.performance");

public final Gson gson;

public static final Type categoryValuesCollectionType = new TypeToken<Collection<CategoryValue>>() {
Expand Down
Expand Up @@ -20,7 +20,7 @@
public class ProjectCommandExecutor{

private static final Logger log =
Logger.getLogger(ProjectCommandExecutor.class.getName());
Logger.getLogger(ProjectCommandExecutor.class);

protected Queue<IExecutorCommand> queue;
protected ListeningExecutorService commandExecutor;
Expand Down
Expand Up @@ -16,7 +16,7 @@
@Provider
public class ExceptionMapping implements ExceptionMapper<Exception>{

private static Logger log = Logger.getLogger(ExceptionMapping.class.getName());
private static Logger log = Logger.getLogger(ExceptionMapping.class);
@Context
ServletContext context;

Expand Down
41 changes: 22 additions & 19 deletions troia-server/src/main/resources/log4j.properties
@@ -1,22 +1,25 @@
#log4j.rootLogger=DEBUG, CONSOLE, FILE
log4j.rootLogger=INFO, FILE
log4j.logger.com.datascience=DEBUG, app_debug, app_warn, app_error

log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.out
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p - %m%n
log4j.appender.app_debug=org.apache.log4j.RollingFileAppender
log4j.appender.app_debug.Threshold=DEBUG
log4j.appender.app_debug.File=/tmp/troia.debug.log
log4j.appender.app_debug.MaxFileSize=10024KB
log4j.appender.app_debug.MaxBackupIndex=3
log4j.appender.app_debug.layout=org.apache.log4j.PatternLayout
log4j.appender.app_debug.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p - %m%n

log4j.appender.FILE=org.apache.log4j.RollingFileAppender
log4j.appender.FILE.File=dsas.log
log4j.appender.FILE.MaxFileSize=1024KB
log4j.appender.FILE.MaxBackupIndex=3
log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
log4j.appender.FILE.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p - %m%n
log4j.appender.app_warn=org.apache.log4j.RollingFileAppender
log4j.appender.app_warn.Threshold=WARN
log4j.appender.app_warn.File=/tmp/troia.warn.log
log4j.appender.app_warn.MaxFileSize=1024KB
log4j.appender.app_warn.MaxBackupIndex=3
log4j.appender.app_warn.layout=org.apache.log4j.PatternLayout
log4j.appender.app_warn.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p - %m%n

log4j.logger.troia.performance=DEBUG, PERFFILE
log4j.appender.PERFFILE=org.apache.log4j.RollingFileAppender
log4j.appender.PERFFILE.File=troia_perf.log
log4j.appender.PERFFILE.MaxFileSize=10MB
log4j.appender.PERFFILE.MaxBackupIndex=3
log4j.appender.PERFFILE.layout=org.apache.log4j.PatternLayout
log4j.appender.PERFFILE.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p - %m%n
log4j.appender.app_error=org.apache.log4j.RollingFileAppender
log4j.appender.app_error.Threshold=ERROR
log4j.appender.app_error.File=/tmp/troia.error.log
log4j.appender.app_error.MaxFileSize=1024KB
log4j.appender.app_error.MaxBackupIndex=3
log4j.appender.app_error.layout=org.apache.log4j.PatternLayout
log4j.appender.app_error.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p - %m%n
17 changes: 0 additions & 17 deletions troia-server/src/main/resources/log4j.xml

This file was deleted.

0 comments on commit feedfac

Please sign in to comment.