Skip to content
This repository was archived by the owner on Feb 18, 2024. It is now read-only.

Commit feedfac

Browse files
author
arturambroziak
committed
Merge ca2ac25 into 72c0dc7
2 parents 72c0dc7 + ca2ac25 commit feedfac

File tree

6 files changed

+25
-41
lines changed

6 files changed

+25
-41
lines changed

Diff for: troia-server/src/main/java/com/datascience/core/storages/CachedJobStorage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
public class CachedJobStorage implements IJobStorage {
2020

21-
private static Logger logger = Logger.getLogger(CachedJobStorage.class.getName());
21+
private static Logger logger = Logger.getLogger(CachedJobStorage.class);
2222

2323
protected IJobStorage cachedJobStorage;
2424
protected LoadingCache<String, Optional<Job>> cache;

Diff for: troia-server/src/main/java/com/datascience/core/storages/JSONUtils.java

-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@
5252
*
5353
*/
5454
public class JSONUtils {
55-
private static final Logger logger = Logger.getLogger("troia.performance");
56-
5755
public final Gson gson;
5856

5957
public static final Type categoryValuesCollectionType = new TypeToken<Collection<CategoryValue>>() {

Diff for: troia-server/src/main/java/com/datascience/executor/ProjectCommandExecutor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public class ProjectCommandExecutor{
2121

2222
private static final Logger log =
23-
Logger.getLogger(ProjectCommandExecutor.class.getName());
23+
Logger.getLogger(ProjectCommandExecutor.class);
2424

2525
protected Queue<IExecutorCommand> queue;
2626
protected ListeningExecutorService commandExecutor;

Diff for: troia-server/src/main/java/com/datascience/service/ExceptionMapping.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@Provider
1717
public class ExceptionMapping implements ExceptionMapper<Exception>{
1818

19-
private static Logger log = Logger.getLogger(ExceptionMapping.class.getName());
19+
private static Logger log = Logger.getLogger(ExceptionMapping.class);
2020
@Context
2121
ServletContext context;
2222

Diff for: troia-server/src/main/resources/log4j.properties

+22-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
1-
#log4j.rootLogger=DEBUG, CONSOLE, FILE
2-
log4j.rootLogger=INFO, FILE
1+
log4j.logger.com.datascience=DEBUG, app_debug, app_warn, app_error
32

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

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

16-
log4j.logger.troia.performance=DEBUG, PERFFILE
17-
log4j.appender.PERFFILE=org.apache.log4j.RollingFileAppender
18-
log4j.appender.PERFFILE.File=troia_perf.log
19-
log4j.appender.PERFFILE.MaxFileSize=10MB
20-
log4j.appender.PERFFILE.MaxBackupIndex=3
21-
log4j.appender.PERFFILE.layout=org.apache.log4j.PatternLayout
22-
log4j.appender.PERFFILE.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p - %m%n
19+
log4j.appender.app_error=org.apache.log4j.RollingFileAppender
20+
log4j.appender.app_error.Threshold=ERROR
21+
log4j.appender.app_error.File=/tmp/troia.error.log
22+
log4j.appender.app_error.MaxFileSize=1024KB
23+
log4j.appender.app_error.MaxBackupIndex=3
24+
log4j.appender.app_error.layout=org.apache.log4j.PatternLayout
25+
log4j.appender.app_error.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p - %m%n

Diff for: troia-server/src/main/resources/log4j.xml

-17
This file was deleted.

0 commit comments

Comments
 (0)