aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--conf/log4j.properties4
-rwxr-xr-xrun1
3 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8156d6e8c1..5abdec5d50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ third_party/libmesos.so
third_party/libmesos.dylib
conf/java-opts
conf/spark-env.sh
+conf/log4j.properties
diff --git a/conf/log4j.properties b/conf/log4j.properties
new file mode 100644
index 0000000000..dfbf25db76
--- /dev/null
+++ b/conf/log4j.properties
@@ -0,0 +1,4 @@
+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
diff --git a/run b/run
index ab6889b157..fe4b929500 100755
--- a/run
+++ b/run
@@ -29,6 +29,7 @@ export JAVA_OPTS
# Build up classpath
SPARK_CLASSPATH="$SPARK_CLASSPATH:$FWDIR/build/classes"
+SPARK_CLASSPATH+=:$FWDIR/conf
SPARK_CLASSPATH+=:$FWDIR/third_party/mesos.jar
SPARK_CLASSPATH+=:$FWDIR/third_party/asm-3.2/lib/all/asm-all-3.2.jar
SPARK_CLASSPATH+=:$FWDIR/third_party/colt.jar