commit f66cf21e1f372e4d765c70cbad0b2fae8d595603
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu May 29 23:16:44 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Fri May 30 08:32:23 2014 -0700
tree c9af58083d13b2f98b7eb21d2d86f739d6dfd459
parent 6dfba3922d77b7f63332183ff4d8451b2b37709a

Enable ZooKeeper logging.

ZooKeeper log was not being correctly written
as a side-effect of ZK related environment variable
we've started using in onos.sh.

This patch will add an environment variable before running
ZK process to use the default log4j config
supplied with the ZooKeeper distribution.

Change-Id: I8ecb2f5a455bef16421811cf989afdd730992e5d

onos.sh

diff --git a/onos.sh b/onos.sh
index 6c0891c..c1e1b2b 100755
--- a/onos.sh
+++ b/onos.sh
@@ -456,8 +456,12 @@
   mkdir -p ${ZK_LOG_DIR}
   
   load-zk-cfg
-  
-  ${ZK_HOME}/bin/zkServer.sh start
+
+  # log4j.properties is read from classpath if not found in CWD.
+  # Using the ZooKeeper supplied default in ZooKeeper conf dir.
+  # TODO: To explicitly specify our customized log4j config file:
+  #  export SERVER_JVMFLAGS="-Dlog4j.configuration=${ZK_LOG4J}"
+  env CLASSPATH="${ZK_HOME}/conf:${CLASSPATH}" ${ZK_HOME}/bin/zkServer.sh start
 }
 
 function stop-zk {