summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMahadev Konar <mahadev@apache.org>2011-02-09 23:41:17 +0000
committerMahadev Konar <mahadev@apache.org>2011-02-09 23:41:17 +0000
commit02d9be777e0e39dad366bc7a194427c3c2364600 (patch)
tree68fb92d49405d79386772ac5dbb5e7f882aad22b /conf
parent02e2b883169869522716d591c3a3c9042f074272 (diff)
downloadzookeeper-02d9be777e0e39dad366bc7a194427c3c2364600.tar.gz
ZOOKEEPER-980. allow configuration parameters for log4j.properties (phunt via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1069169 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'conf')
-rw-r--r--conf/log4j.properties19
1 files changed, 14 insertions, 5 deletions
diff --git a/conf/log4j.properties b/conf/log4j.properties
index 255cf96de..982597059 100644
--- a/conf/log4j.properties
+++ b/conf/log4j.properties
@@ -1,3 +1,12 @@
+# Define some default values that can be overridden by system properties
+zookeeper.root.logger=INFO, CONSOLE
+zookeeper.console.threshold=INFO
+zookeeper.log.dir=.
+zookeeper.log.file=zookeeper.log
+zookeeper.log.threshold=DEBUG
+zookeeper.tracelog.dir=.
+zookeeper.tracelog.file=zookeeper_trace.log
+
#
# ZooKeeper Logging Configuration
#
@@ -5,7 +14,7 @@
# Format is "<default threshold> (, <appender>)+
# DEFAULT: console appender only
-log4j.rootLogger=INFO, CONSOLE
+log4j.rootLogger=${zookeeper.root.logger}
# Example with rolling log file
#log4j.rootLogger=DEBUG, CONSOLE, ROLLINGFILE
@@ -17,7 +26,7 @@ log4j.rootLogger=INFO, CONSOLE
# Log INFO level and above messages to the console
#
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.Threshold=${zookeeper.console.threshold}
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n
@@ -25,8 +34,8 @@ log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] - %-
# Add ROLLINGFILE to rootLogger to get log file output
# Log DEBUG level and above messages to a log file
log4j.appender.ROLLINGFILE=org.apache.log4j.RollingFileAppender
-log4j.appender.ROLLINGFILE.Threshold=DEBUG
-log4j.appender.ROLLINGFILE.File=zookeeper.log
+log4j.appender.ROLLINGFILE.Threshold=${zookeeper.log.threshold}
+log4j.appender.ROLLINGFILE.File=${zookeeper.log.dir}/${zookeeper.log.file}
# Max log file size of 10MB
log4j.appender.ROLLINGFILE.MaxFileSize=10MB
@@ -42,7 +51,7 @@ log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}]
# Log DEBUG level and above messages to a log file
log4j.appender.TRACEFILE=org.apache.log4j.FileAppender
log4j.appender.TRACEFILE.Threshold=TRACE
-log4j.appender.TRACEFILE.File=zookeeper_trace.log
+log4j.appender.TRACEFILE.File=${zookeeper.tracelog.dir}/${zookeeper.tracelog.file}
log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
### Notice we are including log4j's NDC here (%x)