X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Flogback-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyang%2Flogback%2Fconfig%2FContextSetterImpl.java;h=cbb2182e830d9aab4116b6aecadae88ac15ddbbc;hp=087648cae7e2b6e80980caee648b124bcaae1179;hb=40dbec0109e46565adc823aa95a37066fc2cecf9;hpb=5448d6812e386bd56aec7209c4852c586a6163b3 diff --git a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/ContextSetterImpl.java b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/ContextSetterImpl.java index 087648cae7..cbb2182e83 100644 --- a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/ContextSetterImpl.java +++ b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/ContextSetterImpl.java @@ -16,6 +16,7 @@ import ch.qos.logback.core.Appender; import ch.qos.logback.core.rolling.FixedWindowRollingPolicy; import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy; import ch.qos.logback.core.rolling.TimeBasedRollingPolicy; +import ch.qos.logback.core.util.FileSize; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; @@ -35,7 +36,7 @@ import org.slf4j.LoggerFactory; public class ContextSetterImpl implements ContextSetter, Closeable { private final LogbackStatusListener statusListener; - private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(ContextSetterImpl.class); + private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(ContextSetterImpl.class); public ContextSetterImpl(final LogbackRuntimeRegistrator rootRuntimeBeanRegistratorWrapper) { statusListener = new LogbackStatusListener(rootRuntimeBeanRegistratorWrapper); @@ -81,11 +82,11 @@ public class ContextSetterImpl implements ContextSetter, Closeable { Map> appendersMap = getAppenders(module, context); for (LoggerTO logger : module.getLoggerTO()) { - LOGGER.trace("Setting configuration for logger {}", logger.getLoggerName()); + LOG.trace("Setting configuration for logger {}", logger.getLoggerName()); final ch.qos.logback.classic.Logger logbackLogger = context.getLogger(logger.getLoggerName()); Optional>> appendersBefore = getAppendersBefore(loggersBefore, logbackLogger); - LOGGER.trace("Logger {}: Appenders registered before: {}", logger.getLoggerName(), + LOG.trace("Logger {}: Appenders registered before: {}", logger.getLoggerName(), appendersBefore.isPresent() ? appendersBefore.get() : "NO APPENDERS BEFORE"); logbackLogger.setLevel(Level.toLevel(logger.getLevel())); @@ -101,7 +102,7 @@ public class ContextSetterImpl implements ContextSetter, Closeable { for (String appenderName : logger.getAppenders()) { if (appendersMap.containsKey(appenderName)) { logbackLogger.addAppender(appendersMap.get(appenderName)); - LOGGER.trace("Logger {}: Adding new appender: {}", logger.getLoggerName(), appenderName); + LOG.trace("Logger {}: Adding new appender: {}", logger.getLoggerName(), appenderName); } else { throw new IllegalStateException("No appender " + appenderName + " found. This error should have been discovered by validation"); @@ -116,7 +117,7 @@ public class ContextSetterImpl implements ContextSetter, Closeable { for (Appender appenderBefore : appendersBefore.get()) { logbackLogger.detachAppender(appenderBefore); appenderBefore.stop(); - LOGGER.trace("Logger {}: Removing old appender: {}", logger.getLoggerName(), + LOG.trace("Logger {}: Removing old appender: {}", logger.getLoggerName(), appenderBefore.getName()); } loggersBefore.remove(logbackLogger); @@ -215,7 +216,7 @@ public class ContextSetterImpl implements ContextSetter, Closeable { } SizeBasedTriggeringPolicy triggeringPolicy = new SizeBasedTriggeringPolicy<>(); triggeringPolicy.setContext(context); - triggeringPolicy.setMaxFileSize(appender.getMaxFileSize()); + triggeringPolicy.setMaxFileSize(FileSize.valueOf(appender.getMaxFileSize())); triggeringPolicy.start(); app.setTriggeringPolicy(triggeringPolicy); app.setName(appender.getName());