diff --git a/server/src/main/java/org/red5/server/Launcher.java b/server/src/main/java/org/red5/server/Launcher.java index 6ad7cd639f9f68deeeb4b520031ec589133da854..20ce3d090e6452abef17f2a47968c6080b06c050 100644 --- a/server/src/main/java/org/red5/server/Launcher.java +++ b/server/src/main/java/org/red5/server/Launcher.java @@ -21,6 +21,8 @@ import org.springframework.context.support.FileSystemXmlApplicationContext; */ public class Launcher { + private static final String l_root = "red5.root"; + /** * Launch Red5 under it's own classloader * @@ -28,15 +30,13 @@ public class Launcher { * on error */ public void launch() throws Exception { - System.out.printf("Root: %s%nDeploy type: %s%n", System.getProperty("red5.root"), System.getProperty("red5.deployment.type")); + System.out.printf("Root: %s%nDeploy type: %s%n", System.getProperty(l_root), System.getProperty("red5.deployment.type")); // check for the logback disable flag boolean useLogback = Boolean.valueOf(System.getProperty("useLogback", "true")); - if (useLogback) { - // check for context selector in system properties - if (System.getProperty("logback.ContextSelector") == null) { + // check for context selector in system properties + if (useLogback && System.getProperty("logback.ContextSelector") == null) { // set our selector System.setProperty("logback.ContextSelector", "org.red5.logging.LoggingContextSelector"); - } } Red5LoggerFactory.setUseLogback(useLogback); // install the slf4j bridge (mostly for JUL logging) @@ -55,8 +55,8 @@ public class Launcher { FileSystemXmlApplicationContext root = new FileSystemXmlApplicationContext(new String[] { "classpath:/red5.xml" }, false); // set the current threads classloader as the loader for the factory/appctx root.setClassLoader(Thread.currentThread().getContextClassLoader()); - root.setId("red5.root"); - root.setBeanName("red5.root"); + root.setId(l_root); + root.setBeanName(l_root); // refresh must be called before accessing the bean factory log.trace("Refreshing root server context"); root.refresh();