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=02fba141b338872fe6a1fefa473d56110f9777d8;hb=40dbec0109e46565adc823aa95a37066fc2cecf9;hpb=49bfc449558d0306f0b6550bc5bdf41e5cafca44 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 02fba141b3..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 @@ -1,24 +1,12 @@ -/** - * Generated file - - * Generated from: yang module name: config-test yang module local name: testing - * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - * Generated at: Fri Sep 27 14:06:33 CEST 2013 +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. * - * Do not modify this file unless it is present under src/main directory + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html */ package org.opendaylight.controller.config.yang.logback.config; -import java.io.Closeable; -import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.slf4j.LoggerFactory; - import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.encoder.PatternLayoutEncoder; @@ -28,10 +16,18 @@ 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; +import java.io.Closeable; +import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.slf4j.LoggerFactory; /** * Implementation of {@link ContextSetter}. Resets running logback @@ -40,14 +36,15 @@ import com.google.common.collect.Sets; public class ContextSetterImpl implements ContextSetter, Closeable { private final LogbackStatusListener statusListener; - private static final org.slf4j.Logger classLogger = LoggerFactory.getLogger(ContextSetterImpl.class); + private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(ContextSetterImpl.class); - public ContextSetterImpl(LogbackRuntimeRegistrator rootRuntimeBeanRegistratorWrapper) { + public ContextSetterImpl(final LogbackRuntimeRegistrator rootRuntimeBeanRegistratorWrapper) { statusListener = new LogbackStatusListener(rootRuntimeBeanRegistratorWrapper); statusListener.register(); } - public void updateContext(LogbackModule module) { + @Override + public void updateContext(final LogbackModule module) { LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); List loggersBefore = context.getLoggerList(); @@ -55,12 +52,12 @@ public class ContextSetterImpl implements ContextSetter, Closeable { createLoggers(context, module, Sets.newHashSet(loggersBefore)); } - private Map> createConsoleAppenders(LoggerContext context, LogbackModule module) { + private Map> createConsoleAppenders(final LoggerContext context, final LogbackModule module) { Map> appendersMap = new HashMap<>(); for (ConsoleAppenderTO appender : module.getConsoleAppenderTO()) { Preconditions.checkState(appendersMap.containsKey(appender.getName()) == false, "Duplicate appender name %s", appender.getName()); - ch.qos.logback.core.ConsoleAppender app = new ch.qos.logback.core.ConsoleAppender(); + ch.qos.logback.core.ConsoleAppender app = new ch.qos.logback.core.ConsoleAppender<>(); app.setContext(context); PatternLayoutEncoder encoder = new PatternLayoutEncoder(); encoder.setContext(context); @@ -79,17 +76,17 @@ public class ContextSetterImpl implements ContextSetter, Closeable { return appendersMap; } - private void createLoggers(LoggerContext context, LogbackModule module, - Set loggersBefore) { + private void createLoggers(final LoggerContext context, final LogbackModule module, + final Set loggersBefore) { Map> appendersMap = getAppenders(module, context); for (LoggerTO logger : module.getLoggerTO()) { - classLogger.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); - classLogger.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())); @@ -99,13 +96,13 @@ public class ContextSetterImpl implements ContextSetter, Closeable { } } - private void addNewAppenders(Map> appendersMap, LoggerTO logger, - ch.qos.logback.classic.Logger logbackLogger, Optional>> appendersBefore) { + private void addNewAppenders(final Map> appendersMap, final LoggerTO logger, + final ch.qos.logback.classic.Logger logbackLogger, final Optional>> appendersBefore) { if (logger.getAppenders() != null) { for (String appenderName : logger.getAppenders()) { if (appendersMap.containsKey(appenderName)) { logbackLogger.addAppender(appendersMap.get(appenderName)); - classLogger.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"); @@ -114,21 +111,21 @@ public class ContextSetterImpl implements ContextSetter, Closeable { } } - private void removeBeforeAppenders(Set loggersBefore, LoggerTO logger, - ch.qos.logback.classic.Logger logbackLogger, Optional>> appendersBefore) { + private void removeBeforeAppenders(final Set loggersBefore, final LoggerTO logger, + final ch.qos.logback.classic.Logger logbackLogger, final Optional>> appendersBefore) { if (appendersBefore.isPresent()) { for (Appender appenderBefore : appendersBefore.get()) { logbackLogger.detachAppender(appenderBefore); appenderBefore.stop(); - classLogger.trace("Logger {}: Removing old appender: {}", logger.getLoggerName(), + LOG.trace("Logger {}: Removing old appender: {}", logger.getLoggerName(), appenderBefore.getName()); } loggersBefore.remove(logbackLogger); } } - private Optional>> getAppendersBefore(Set loggersBefore, - ch.qos.logback.classic.Logger logbackLogger) { + private Optional>> getAppendersBefore(final Set loggersBefore, + final ch.qos.logback.classic.Logger logbackLogger) { if (loggersBefore.contains(logbackLogger)) { Iterator> appenderIt = logbackLogger.iteratorForAppenders(); Set> appendersBefore = Sets.newHashSet(); @@ -136,12 +133,13 @@ public class ContextSetterImpl implements ContextSetter, Closeable { appendersBefore.add(appenderIt.next()); } return Optional.of(appendersBefore); - } else + } else { return Optional.absent(); + } } - private Map> getAppenders(LogbackModule module, LoggerContext context) { + private Map> getAppenders(final LogbackModule module, final LoggerContext context) { Map> appendersMap = new HashMap<>(); addAllAppenders(appendersMap, createRollingAppenders(context, module)); addAllAppenders(appendersMap, createFileAppenders(context, module)); @@ -150,8 +148,8 @@ public class ContextSetterImpl implements ContextSetter, Closeable { return appendersMap; } - private void addAllAppenders(Map> allAppenders, - Map> appendersToAdd) { + private void addAllAppenders(final Map> allAppenders, + final Map> appendersToAdd) { for (String appenderName : appendersToAdd.keySet()) { Preconditions.checkState(allAppenders.containsKey(appenderName) == false, "Duplicate appender name %s", appenderName); @@ -159,12 +157,12 @@ public class ContextSetterImpl implements ContextSetter, Closeable { } } - private Map> createFileAppenders(LoggerContext context, LogbackModule module) { + private Map> createFileAppenders(final LoggerContext context, final LogbackModule module) { Map> appendersMap = new HashMap<>(); for (FileAppenderTO appender : module.getFileAppenderTO()) { Preconditions.checkState(appendersMap.containsKey(appender.getName()) == false, "Duplicate appender name %s", appender.getName()); - ch.qos.logback.core.FileAppender app = new ch.qos.logback.core.FileAppender<>(); + ch.qos.logback.core.FileAppender app = new ch.qos.logback.core.FileAppender<>(); app.setAppend(appender.getAppend()); app.setContext(context); PatternLayoutEncoder encoder = new PatternLayoutEncoder(); @@ -181,12 +179,12 @@ public class ContextSetterImpl implements ContextSetter, Closeable { return appendersMap; } - private Map> createRollingAppenders(LoggerContext context, LogbackModule module) { + private Map> createRollingAppenders(final LoggerContext context, final LogbackModule module) { Map> appendersMap = new HashMap<>(); for (RollingFileAppenderTO appender : module.getRollingFileAppenderTO()) { Preconditions.checkState(appendersMap.containsKey(appender.getName()) == false, "Duplicate appender name %s", appender.getName()); - ch.qos.logback.core.rolling.RollingFileAppender app = new ch.qos.logback.core.rolling.RollingFileAppender<>(); + ch.qos.logback.core.rolling.RollingFileAppender app = new ch.qos.logback.core.rolling.RollingFileAppender<>(); app.setAppend(appender.getAppend()); app.setContext(context); PatternLayoutEncoder encoder = new PatternLayoutEncoder(); @@ -205,7 +203,7 @@ public class ContextSetterImpl implements ContextSetter, Closeable { policy.start(); app.setRollingPolicy(policy); } else if (appender.getRollingPolicyType().equals("TimeBasedRollingPolicy")) { - TimeBasedRollingPolicy policy = new TimeBasedRollingPolicy(); + TimeBasedRollingPolicy policy = new TimeBasedRollingPolicy<>(); policy.setContext(context); policy.setMaxHistory(appender.getMaxHistory()); if (appender.getCleanHistoryOnStart() != null) { @@ -216,9 +214,9 @@ public class ContextSetterImpl implements ContextSetter, Closeable { policy.start(); app.setRollingPolicy(policy); } - SizeBasedTriggeringPolicy triggeringPolicy = new SizeBasedTriggeringPolicy(); + 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());