You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/02 02:04:09 UTC
[9/9] git commit: Merge pull request #312 from pwendell/log4j-fix-2
Merge pull request #312 from pwendell/log4j-fix-2
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).
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/c1d928a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/c1d928a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/c1d928a8
Branch: refs/heads/master
Commit: c1d928a897f8daed5d7e74f4af476b67046f348d
Parents: 9a0ff72 f8d245b
Author: Patrick Wendell <pw...@gmail.com>
Authored: Wed Jan 1 17:03:48 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Jan 1 17:03:48 2014 -0800
----------------------------------------------------------------------
.../org/apache/spark/default-log4j.properties | 8 ++++
.../scala/org/apache/spark/HttpServer.scala | 1 +
.../main/scala/org/apache/spark/Logging.scala | 41 +++++++++++++++++---
.../scala/org/apache/spark/SparkContext.scala | 3 --
.../org/apache/spark/executor/Executor.scala | 2 -
.../apache/spark/metrics/MetricsConfig.scala | 1 -
.../apache/spark/metrics/MetricsSystem.scala | 1 -
.../spark/storage/BlockManagerMasterActor.scala | 2 -
.../spark/storage/BlockManagerWorker.scala | 3 --
.../spark/storage/BlockMessageArray.scala | 2 -
.../org/apache/spark/CheckpointSuite.scala | 2 -
spark-class | 9 ++++-
.../org/apache/spark/streaming/DStream.scala | 2 -
.../apache/spark/streaming/DStreamGraph.scala | 1 -
.../spark/streaming/StreamingContext.scala | 2 -
.../streaming/dstream/NetworkInputDStream.scala | 2 -
.../streaming/scheduler/JobGenerator.scala | 2 -
.../streaming/scheduler/JobScheduler.scala | 2 -
.../streaming/util/MasterFailureTest.scala | 3 --
19 files changed, 52 insertions(+), 37 deletions(-)
----------------------------------------------------------------------