From 41af54c07509a1aabd9f0e0e111e7f13616f3cee Mon Sep 17 00:00:00 2001 From: Andrew Ash Date: Thu, 22 May 2014 00:54:43 -0400 Subject: [PATCH 1/4] Change log4j.properties.template - Only send ERROR and higher to stderr - Send everything to stdout --- conf/log4j.properties.template | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/conf/log4j.properties.template b/conf/log4j.properties.template index f7f853559468a..55a812ac34edb 100644 --- a/conf/log4j.properties.template +++ b/conf/log4j.properties.template @@ -1,11 +1,18 @@ -# Set everything to be logged to the console -log4j.rootCategory=INFO, console -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n +# Log INFO and above to stdout +log4j.rootCategory=INFO, stdout, stderr +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n -# Settings to quiet third party logs that are too verbose +# Log ERROR and above to stderr +log4j.appender.stderr=org.apache.log4j.ConsoleAppender +log4j.appender.stderr.target=System.err +log4j.appender.stderr.layout=org.apache.log4j.PatternLayout +log4j.appender.stderr.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n +log4j.appender.stderr.threshold=ERROR + +# Settings to quiet logs that are too verbose log4j.logger.org.eclipse.jetty=WARN log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO From d094463519ba3b50293dc06bfe51717204a1e21f Mon Sep 17 00:00:00 2001 From: Andrew Ash Date: Thu, 22 May 2014 01:00:40 -0400 Subject: [PATCH 2/4] Use 4-year dates in default logging --- conf/log4j.properties.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/log4j.properties.template b/conf/log4j.properties.template index 55a812ac34edb..a7dca0c43201c 100644 --- a/conf/log4j.properties.template +++ b/conf/log4j.properties.template @@ -3,13 +3,13 @@ log4j.rootCategory=INFO, stdout, stderr log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.target=System.out log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %p %c{1}: %m%n # Log ERROR and above to stderr log4j.appender.stderr=org.apache.log4j.ConsoleAppender log4j.appender.stderr.target=System.err log4j.appender.stderr.layout=org.apache.log4j.PatternLayout -log4j.appender.stderr.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n +log4j.appender.stderr.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %p %c{1}: %m%n log4j.appender.stderr.threshold=ERROR # Settings to quiet logs that are too verbose From 3fd0b4194cd2a8361d32d249a9e5c84b0957a3b5 Mon Sep 17 00:00:00 2001 From: Andrew Ash Date: Fri, 23 May 2014 18:25:33 -0700 Subject: [PATCH 3/4] Separate comment for log4j.rootCategory --- conf/log4j.properties.template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/log4j.properties.template b/conf/log4j.properties.template index a7dca0c43201c..5c7af36774063 100644 --- a/conf/log4j.properties.template +++ b/conf/log4j.properties.template @@ -1,5 +1,7 @@ -# Log INFO and above to stdout +# Send logs to both stdout and stderr appenders log4j.rootCategory=INFO, stdout, stderr + +# Log INFO and above to stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.target=System.out log4j.appender.stdout.layout=org.apache.log4j.PatternLayout From 2a0a27c336aad11f4df37c52b74eb0a10eb59359 Mon Sep 17 00:00:00 2001 From: Andrew Ash Date: Fri, 23 May 2014 18:31:10 -0700 Subject: [PATCH 4/4] Actually change the defaults, not just the template Ideally these two identical files shouldn't be kept manually in sync, but oh well --- .../apache/spark/log4j-defaults.properties | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/core/src/main/resources/org/apache/spark/log4j-defaults.properties b/core/src/main/resources/org/apache/spark/log4j-defaults.properties index f7f853559468a..5c7af36774063 100644 --- a/core/src/main/resources/org/apache/spark/log4j-defaults.properties +++ b/core/src/main/resources/org/apache/spark/log4j-defaults.properties @@ -1,11 +1,20 @@ -# Set everything to be logged to the console -log4j.rootCategory=INFO, console -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.err -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n +# Send logs to both stdout and stderr appenders +log4j.rootCategory=INFO, stdout, stderr -# Settings to quiet third party logs that are too verbose +# Log INFO and above to stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %p %c{1}: %m%n + +# Log ERROR and above to stderr +log4j.appender.stderr=org.apache.log4j.ConsoleAppender +log4j.appender.stderr.target=System.err +log4j.appender.stderr.layout=org.apache.log4j.PatternLayout +log4j.appender.stderr.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %p %c{1}: %m%n +log4j.appender.stderr.threshold=ERROR + +# Settings to quiet logs that are too verbose log4j.logger.org.eclipse.jetty=WARN log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO