Updated Branches:
refs/heads/master f892da871 -> b6d40b782
Merge pull request #560 from pwendell/logging. Closes #560.
[WIP] SPARK-1067: Default log4j initialization causes errors for those not
using log4j
To fix this - we add a check when initializing log4j.
Author: Patrick Wendell <pwend...@gmail.com>
== Merge branch commits ==
commit ffdce513877f64b6eed6d36138c3e0003d392889
Author: Patrick Wendell <pwend...@gmail.com>
Date: Fri Feb 7 15:22:29 2014 -0800
Logging fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/b6d40b78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/b6d40b78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/b6d40b78
Branch: refs/heads/master
Commit: b6d40b782327188a25ded5b22790552121e5271f
Parents: f892da8
Author: Patrick Wendell <pwend...@gmail.com>
Authored: Sat Feb 8 23:35:31 2014 -0800
Committer: Reynold Xin <r...@apache.org>
Committed: Sat Feb 8 23:35:31 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/Logging.scala | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/b6d40b78/core/src/main/scala/org/apache/spark/Logging.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/Logging.scala
b/core/src/main/scala/org/apache/spark/Logging.scala
index b749e54..7423082 100644
--- a/core/src/main/scala/org/apache/spark/Logging.scala
+++ b/core/src/main/scala/org/apache/spark/Logging.scala
@@ -19,6 +19,7 @@ package org.apache.spark
import org.apache.log4j.{LogManager, PropertyConfigurator}
import org.slf4j.{Logger, LoggerFactory}
+import org.slf4j.impl.StaticLoggerBinder
/**
* Utility trait for classes that want to log data. Creates a SLF4J logger for
the class and allows
@@ -101,9 +102,11 @@ trait Logging {
}
private def initializeLogging() {
- // If Log4j doesn't seem initialized, load a default properties file
+ // If Log4j is being used, but is not initialized, load a default
properties file
+ val binder = StaticLoggerBinder.getSingleton
+ val usingLog4j =
binder.getLoggerFactoryClassStr.endsWith("Log4jLoggerFactory")
val log4jInitialized =
LogManager.getRootLogger.getAllAppenders.hasMoreElements
- if (!log4jInitialized) {
+ if (!log4jInitialized && usingLog4j) {
val defaultLogProps = "org/apache/spark/log4j-defaults.properties"
val classLoader = this.getClass.getClassLoader
Option(classLoader.getResource(defaultLogProps)) match {
