commit a0c5dc1aabf8a3be5664f33ad1376af415c93fe5
author Jordan Halterman <jordan@opennetworking.org> Mon Nov 12 11:04:46 2018 -0800
committer Jordan Halterman <jordan@opennetworking.org> Tue Nov 13 18:21:33 2018 +0000
tree 83c4696e1cc2384db1c20f8986b4657fe3dc8c1e
parent a05efc35ae0e3da7fc711351f36774926f1da0a6

Allow Atomix logging configuration to be overridden in stc tests

Change-Id: I67c4365859f380dd8c89c645b1a52f382c2595a4

tools/test/bin/atomix-config

diff --git a/tools/test/bin/atomix-config b/tools/test/bin/atomix-config
index f7decba..84b69fe 100755
--- a/tools/test/bin/atomix-config
+++ b/tools/test/bin/atomix-config
@@ -36,6 +36,5 @@
 atomix-gen-config $node $CDEF_FILE
 scp -q $CDEF_FILE $remote:$ATOMIX_INSTALL_DIR/atomix.json
 
-ssh -tt $ONOS_USER@$node "
-    sed -i -e $'s/<logger name=\"io.atomix\" level=\"INFO\" \/>/<logger name=\"io.atomix\" level=\"INFO\" \/>\\\n    <logger name=\"io.atomix.protocols.raft\" level=\"DEBUG\" \/>/g' /opt/atomix/conf/logback.xml
-"
+LOGBACK_FILE="$ONOS_ROOT"/tools/test/configs/atomix/logback.xml
+scp -q $LOGBACK_FILE $remote:/opt/atomix/conf/logback.xml

tools/test/bin/onos-config

diff --git a/tools/test/bin/onos-config b/tools/test/bin/onos-config
index 65df721..6c9ad04 100755
--- a/tools/test/bin/onos-config
+++ b/tools/test/bin/onos-config
@@ -43,10 +43,8 @@
         >> $ONOS_INSTALL_DIR/$KARAF_DIST/etc/system.properties
 
     # Drop copycat related log level for the console
-    echo "log4j.logger.io.atomix=INFO" \
-        >> $ONOS_INSTALL_DIR/$KARAF_DIST/etc/org.ops4j.pax.logging.cfg
-    echo "log4j.logger.io.atomix.cluster.messaging=ERROR" \
-        >> $ONOS_INSTALL_DIR/$KARAF_DIST/etc/org.ops4j.pax.logging.cfg
+    echo "log4j2.logger.atomix.name = io.atomix.protocols.raft" >> $ONOS_INSTALL_DIR/$KARAF_DIST/etc/org.ops4j.pax.logging.cfg
+    echo "log4j2.logger.atomix.level = INFO" >> $ONOS_INSTALL_DIR/$KARAF_DIST/etc/org.ops4j.pax.logging.cfg
 
     # Patch the Apache Karaf distribution file to load ONOS boot features
     perl -pi.old -e \"s|^(featuresBoot=.*,management)(,webconsole,.*)|\1,$ONOS_BOOT_FEATURES|\" \