aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/resources
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2013-12-29 20:29:29 -0800
committerPatrick Wendell <pwendell@gmail.com>2013-12-29 23:14:33 -0800
commitcffe1c1d5c0abfbb463fa91e8b340a9c535532fe (patch)
tree884ee12344cd7fa046029c7aecec5d17f34a2a2d /core/src/main/resources
parent72a17b69f517ad7149d3bcd3a89e2cf715a2f65f (diff)
downloadspark-cffe1c1d5c0abfbb463fa91e8b340a9c535532fe.tar.gz
spark-cffe1c1d5c0abfbb463fa91e8b340a9c535532fe.tar.bz2
spark-cffe1c1d5c0abfbb463fa91e8b340a9c535532fe.zip
SPARK-1008: Logging improvments
1. Adds a default log4j file that gets loaded if users haven't specified a log4j file. 2. Isolates use of the tools assembly jar. I found this produced SLF4J warnings after building with SBT (and I've seen similar warnings on the mailing list).
Diffstat (limited to 'core/src/main/resources')
-rw-r--r--core/src/main/resources/org/apache/spark/default-log4j.properties8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/src/main/resources/org/apache/spark/default-log4j.properties b/core/src/main/resources/org/apache/spark/default-log4j.properties
new file mode 100644
index 0000000000..d72dbadc39
--- /dev/null
+++ b/core/src/main/resources/org/apache/spark/default-log4j.properties
@@ -0,0 +1,8 @@
+# Set everything to be logged to the console
+log4j.rootCategory=INFO, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+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
+
+# Ignore messages below warning level from Jetty, because it's a bit verbose
+log4j.logger.org.eclipse.jetty=WARN