Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Issue fix for config subsystem
[controller.git]
/
opendaylight
/
config
/
logback-config
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
yang
/
logback
/
config
/
ContextSetterImpl.java
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 02fba141b338872fe6a1fefa473d56110f9777d8..ff7da5df483556a9eb2a7bdb2e4e89a03bbff0df 100644
(file)
--- 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,11
+1,9
@@
-/**
- * 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;
*/
package org.opendaylight.controller.config.yang.logback.config;
@@
-40,7
+38,7
@@
import com.google.common.collect.Sets;
public class ContextSetterImpl implements ContextSetter, Closeable {
private final LogbackStatusListener statusListener;
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
LOGGER
= LoggerFactory.getLogger(ContextSetterImpl.class);
public ContextSetterImpl(LogbackRuntimeRegistrator rootRuntimeBeanRegistratorWrapper) {
statusListener = new LogbackStatusListener(rootRuntimeBeanRegistratorWrapper);
public ContextSetterImpl(LogbackRuntimeRegistrator rootRuntimeBeanRegistratorWrapper) {
statusListener = new LogbackStatusListener(rootRuntimeBeanRegistratorWrapper);
@@
-85,11
+83,11
@@
public class ContextSetterImpl implements ContextSetter, Closeable {
Map<String, Appender<ILoggingEvent>> appendersMap = getAppenders(module, context);
for (LoggerTO logger : module.getLoggerTO()) {
Map<String, Appender<ILoggingEvent>> appendersMap = getAppenders(module, context);
for (LoggerTO logger : module.getLoggerTO()) {
-
classLogger
.trace("Setting configuration for logger {}", logger.getLoggerName());
+
LOGGER
.trace("Setting configuration for logger {}", logger.getLoggerName());
final ch.qos.logback.classic.Logger logbackLogger = context.getLogger(logger.getLoggerName());
Optional<Set<Appender<ILoggingEvent>>> appendersBefore = getAppendersBefore(loggersBefore, logbackLogger);
final ch.qos.logback.classic.Logger logbackLogger = context.getLogger(logger.getLoggerName());
Optional<Set<Appender<ILoggingEvent>>> appendersBefore = getAppendersBefore(loggersBefore, logbackLogger);
-
classLogger
.trace("Logger {}: Appenders registered before: {}", logger.getLoggerName(),
+
LOGGER
.trace("Logger {}: Appenders registered before: {}", logger.getLoggerName(),
appendersBefore.isPresent() ? appendersBefore.get() : "NO APPENDERS BEFORE");
logbackLogger.setLevel(Level.toLevel(logger.getLevel()));
appendersBefore.isPresent() ? appendersBefore.get() : "NO APPENDERS BEFORE");
logbackLogger.setLevel(Level.toLevel(logger.getLevel()));
@@
-105,7
+103,7
@@
public class ContextSetterImpl implements ContextSetter, Closeable {
for (String appenderName : logger.getAppenders()) {
if (appendersMap.containsKey(appenderName)) {
logbackLogger.addAppender(appendersMap.get(appenderName));
for (String appenderName : logger.getAppenders()) {
if (appendersMap.containsKey(appenderName)) {
logbackLogger.addAppender(appendersMap.get(appenderName));
-
classLogger
.trace("Logger {}: Adding new appender: {}", logger.getLoggerName(), appenderName);
+
LOGGER
.trace("Logger {}: Adding new appender: {}", logger.getLoggerName(), appenderName);
} else {
throw new IllegalStateException("No appender " + appenderName
+ " found. This error should have been discovered by validation");
} else {
throw new IllegalStateException("No appender " + appenderName
+ " found. This error should have been discovered by validation");
@@
-120,7
+118,7
@@
public class ContextSetterImpl implements ContextSetter, Closeable {
for (Appender<ILoggingEvent> appenderBefore : appendersBefore.get()) {
logbackLogger.detachAppender(appenderBefore);
appenderBefore.stop();
for (Appender<ILoggingEvent> appenderBefore : appendersBefore.get()) {
logbackLogger.detachAppender(appenderBefore);
appenderBefore.stop();
-
classLogger
.trace("Logger {}: Removing old appender: {}", logger.getLoggerName(),
+
LOGGER
.trace("Logger {}: Removing old appender: {}", logger.getLoggerName(),
appenderBefore.getName());
}
loggersBefore.remove(logbackLogger);
appenderBefore.getName());
}
loggersBefore.remove(logbackLogger);
@@
-136,8
+134,9
@@
public class ContextSetterImpl implements ContextSetter, Closeable {
appendersBefore.add(appenderIt.next());
}
return Optional.of(appendersBefore);
appendersBefore.add(appenderIt.next());
}
return Optional.of(appendersBefore);
- } else
+ } else
{
return Optional.absent();
return Optional.absent();
+ }
}
}