mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor logging

This commit is contained in:
Reinhard Pointner 2016-03-10 14:38:34 +00:00
parent ffa98e1989
commit 4d695a1d7d
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/net/filebot/Logging.java
View File

@ -14,23 +14,23 @@ import java.util.logging.SimpleFormatter;
import java.util.logging.StreamHandler; import java.util.logging.StreamHandler;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.filebot.util.SystemProperty;
import org.codehaus.groovy.runtime.StackTraceUtils; import org.codehaus.groovy.runtime.StackTraceUtils;
import net.filebot.util.SystemProperty;
public final class Logging { public final class Logging {
private static final SystemProperty<Pattern> anonymizePattern = SystemProperty.of("net.filebot.logging.anonymize", Pattern::compile); private static final SystemProperty<Pattern> anonymizePattern = SystemProperty.of("net.filebot.logging.anonymize", Pattern::compile);
private static final SystemProperty<Level> debugLevel = SystemProperty.of("net.filebot.logging.debug", Level::parse, Level.CONFIG); private static final SystemProperty<Level> debugLevel = SystemProperty.of("net.filebot.logging.debug", Level::parse, Level.CONFIG);
public static final Logger log = getConsoleLogger("net.filebot.console", Level.ALL, new ConsoleFormatter(anonymizePattern.get())); public static final Logger log = createConsoleLogger("net.filebot.console", Level.ALL);
public static final Logger debug = getConsoleLogger("net.filebot.debug", debugLevel.get(), new ConsoleFormatter(anonymizePattern.get())); public static final Logger debug = createConsoleLogger("net.filebot.debug", debugLevel.get());
public static Logger getConsoleLogger(String name, Level level, Formatter formatter) { public static Logger createConsoleLogger(String name, Level level) {
Logger log = Logger.getLogger(name); Logger log = Logger.getLogger(name);
log.setLevel(level);
log.setUseParentHandlers(false); log.setUseParentHandlers(false);
log.addHandler(new ConsoleHandler(level, formatter)); log.setLevel(level);
log.addHandler(createConsoleHandler(level));
return log; return log;
} }
@ -40,17 +40,19 @@ public final class Logging {
return handler; return handler;
} }
public static ConsoleHandler createConsoleHandler(Level level) {
ConsoleHandler handler = new ConsoleHandler();
handler.setLevel(level);
handler.setFormatter(new ConsoleFormatter(anonymizePattern.get()));
return handler;
}
public static Supplier<String> format(String format, Object... args) { public static Supplier<String> format(String format, Object... args) {
return () -> String.format(format, args); return () -> String.format(format, args);
} }
public static class ConsoleHandler extends Handler { public static class ConsoleHandler extends Handler {
public ConsoleHandler(Level level, Formatter formatter) {
setLevel(level);
setFormatter(formatter);
}
@Override @Override
public void publish(LogRecord record) { public void publish(LogRecord record) {
// use either System.out or System.err depending on the severity of the error // use either System.out or System.err depending on the severity of the error