From b070ba8966ede376029496abbe822622b0b9443d Mon Sep 17 00:00:00 2001 From: guredd Date: Mon, 29 Feb 2016 13:51:50 +0300 Subject: [PATCH] don't configure default logger if some code did it --- src/KaraExec/src/kara/cli/Main.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/KaraExec/src/kara/cli/Main.kt b/src/KaraExec/src/kara/cli/Main.kt index b963d962..a176242e 100644 --- a/src/KaraExec/src/kara/cli/Main.kt +++ b/src/KaraExec/src/kara/cli/Main.kt @@ -1,11 +1,8 @@ package kara.cli -import java.util.HashMap import kara.* -import kara.internal.* import kara.server.JettyRunner import org.apache.log4j.* -import java.util.ArrayList fun server(appConfig : ApplicationConfig) { val jettyRunner = JettyRunner(appConfig) @@ -23,8 +20,7 @@ fun main(args: Array) { if (logPath != null) { PropertyConfigurator.configureAndWatch(logPath, 5000) - } - else { + } else if (LogManager.getRootLogger()?.allAppenders?.hasMoreElements()?.not()?:true) { BasicConfigurator.configure() LogManager.getRootLogger()?.level = Level.INFO }