configure logback.xml file

log file is created only when scale-util class
generates some logs.

Change-Id: Id3c43bcfed7503e2e611c593c392ec1a11e27d89
Signed-off-by: miroslav.kovac <miroslav.kovac@pantheon.tech>

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 3655b6beaea921b000597b029cfe0c0dbc9175c7..0f15d9f3d6cce00e46447bbd30c746294bc6e130 100644 (file)
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -37,6 +37,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.codehaus.janino</groupId>
+            <artifactId>janino</artifactId>
+            <version>2.6.1</version>
+        </dependency>
         <dependency>
             <groupId>net.sourceforge.argparse4j</groupId>
             <artifactId>argparse4j</artifactId>

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/ScaleUtil.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/ScaleUtil.java
index adce359f088e7a3d706fe2ba8589ecfe45978940..a8040f95eedb4f90c1ba3e0cef5062130cf84486 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/ScaleUtil.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/ScaleUtil.java
@@ -9,6 +9,10 @@
 package org.opendaylight.netconf.test.tool;
 
 import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.util.ContextInitializer;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.util.StatusPrinter;
 import com.google.common.base.Stopwatch;
 import com.google.common.io.CharStreams;
 import com.ning.http.client.AsyncHttpClient;
@@ -36,8 +40,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ScaleUtil {
-
-    private static final Logger RESULTS_LOG = LoggerFactory.getLogger("results");
+    private static Logger RESULTS_LOG ;
     private static final ScheduledExecutorService executor = new LoggingWrapperExecutor(4);
 
     private static final int deviceStep = 1000;
@@ -53,8 +56,7 @@ public class ScaleUtil {
     public static void main(final String[] args) {
         final TesttoolParameters params = TesttoolParameters.parseArgs(args, TesttoolParameters.getParser());
 
-        root = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
-        root.setLevel(params.debug ? Level.DEBUG : Level.INFO);
+        setUpLoggers(params);
 
         // cleanup at the start in case controller was already running
         final Runtime runtime = Runtime.getRuntime();
@@ -130,6 +132,14 @@ public class ScaleUtil {
         }
     }
 
+    private static void setUpLoggers(final TesttoolParameters params) {
+        System.setProperty("log_file_name", "scale-util.log");
+
+        root = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+        root.setLevel(params.debug ? Level.DEBUG : Level.INFO);
+        RESULTS_LOG = LoggerFactory.getLogger("results");
+    }
+
     private static void cleanup(final Runtime runtime, final TesttoolParameters params) {
         try {
             stopKaraf(runtime, params);

diff --git a/netconf/tools/netconf-testtool/src/main/resources/logback.xml b/netconf/tools/netconf-testtool/src/main/resources/logback.xml
index 1bdb2f02a0f0862d490ce7764b64bc8e0529651f..a793b8027380a26131e95ab9c54f1b2f06a2fe8e 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/resources/logback.xml
+++ b/netconf/tools/netconf-testtool/src/main/resources/logback.xml
@@ -18,17 +18,21 @@
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <appender name="RESULTS-FILE" class="ch.qos.logback.core.FileAppender">
-        <file>scale-results.log</file>
-        <append>true</append>
-        <encoder>
-          <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
+    <if condition='property("log_file_name").contains("scale-util.log")'>
+        <then>
+            <appender name="RESULTS-FILE" class="ch.qos.logback.core.FileAppender">
+                <file>${log_file_name}</file>
+                <append>true</append>
+                <encoder>
+                    <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+                </encoder>
+            </appender>
 
-    <logger name="results" level="DEBUG" additivity="false">
-       <appender-ref ref="RESULTS-FILE"/>
-    </logger>
+            <logger name="results" level="DEBUG" additivity="false">
+                <appender-ref ref="RESULTS-FILE"/>
+            </logger>
+        </then>
+    </if>
 
     <logger name="com.ning.http.client" level="WARN"/>
 </configuration>
\ No newline at end of file