Merge pull request #25458 from vespa-engine/mpolden/zk-cli-logging

Reduce vespa-zkctl log spam

4 files changed, 16 insertions, 9 deletions

diff --git a/zookeeper-command-line-client/src/main/resources/log4j-vespa.properties b/zookeeper-command-line-client/src/main/resources/log4j-vespa.properties
deleted file mode 100644
index add1f89ddb4..00000000000
--- a/zookeeper-command-line-client/src/main/resources/log4j-vespa.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=debug,console
-
-# console is set to be a ConsoleAppender using a PatternLayout
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=[%-5p] %m%n
-log4j.appender.console.threshold=warn
diff --git a/zookeeper-command-line-client/src/main/resources/logback-vespa.xml b/zookeeper-command-line-client/src/main/resources/logback-vespa.xml
new file mode 100644
index 00000000000..fe613da5b63
--- /dev/null
+++ b/zookeeper-command-line-client/src/main/resources/logback-vespa.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>[%-5p] %m%n</pattern>
+    </encoder>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>warn</level>
+    </filter>
+  </appender>
+  <root level="debug">
+    <appender-ref ref="console"/>
+  </root>
+</configuration>
diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkcli b/zookeeper-command-line-client/src/main/sh/vespa-zkcli
index 66c496b0d29..b907aae466f 100755
--- a/zookeeper-command-line-client/src/main/sh/vespa-zkcli
+++ b/zookeeper-command-line-client/src/main/sh/vespa-zkcli
@@ -78,5 +78,5 @@ export ROOT
 # END environment bootstrap section
 
 java -cp ${VESPA_HOME}/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \
-     -Dlog4j.configuration="log4j-vespa.properties" -Xms32m -Xmx512m \
+     -Dlogback.configurationFile="logback-vespa.xml" -Xms32m -Xmx512m \
      com.yahoo.vespa.zookeeper.cli.Main "$@"
diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkflw b/zookeeper-command-line-client/src/main/sh/vespa-zkflw
index 5ae8ff5f7ac..f7ca82a5eee 100644
--- a/zookeeper-command-line-client/src/main/sh/vespa-zkflw
+++ b/zookeeper-command-line-client/src/main/sh/vespa-zkflw
@@ -78,5 +78,5 @@ export ROOT
 # END environment bootstrap section
 
 java -cp ${VESPA_HOME}/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \
-     -Dlog4j.configuration="log4j-vespa.properties" -Xms32m -Xmx512m \
+     -Dlogback.configurationFile="logback-vespa.xml" -Xms32m -Xmx512m \
      com.yahoo.vespa.zookeeper.cli.FourLetterWordMain "$@"