diff options
author | Reynold Xin <rxin@apache.org> | 2014-07-04 17:33:07 -0700 |
---|---|---|
committer | Reynold Xin <rxin@apache.org> | 2014-07-04 17:33:07 -0700 |
commit | 0db5d5a22ef8dd6e3fbb2759cd25aac46bdf2ce9 (patch) | |
tree | d4eca58f804861bd8bd066656cc8f98c82833c0e | |
parent | fc716589384f70096ba2fe1eb6a4131c61b21c7c (diff) | |
download | spark-0db5d5a22ef8dd6e3fbb2759cd25aac46bdf2ce9.tar.gz spark-0db5d5a22ef8dd6e3fbb2759cd25aac46bdf2ce9.tar.bz2 spark-0db5d5a22ef8dd6e3fbb2759cd25aac46bdf2ce9.zip |
Added SignalLogger to HistoryServer.
This was omitted in #1260. @aarondav
Author: Reynold Xin <rxin@apache.org>
Closes #1300 from rxin/historyServer and squashes the following commits:
af720a3 [Reynold Xin] Added SignalLogger to HistoryServer.
-rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala index 29a78a56c8..56b38ddfc9 100644 --- a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala +++ b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala @@ -27,7 +27,7 @@ import org.apache.spark.{Logging, SecurityManager, SparkConf} import org.apache.spark.deploy.SparkHadoopUtil import org.apache.spark.ui.{WebUI, SparkUI, UIUtils} import org.apache.spark.ui.JettyUtils._ -import org.apache.spark.util.Utils +import org.apache.spark.util.{SignalLogger, Utils} /** * A web server that renders SparkUIs of completed applications. @@ -169,10 +169,11 @@ class HistoryServer( * * This launches the HistoryServer as a Spark daemon. */ -object HistoryServer { +object HistoryServer extends Logging { private val conf = new SparkConf def main(argStrings: Array[String]) { + SignalLogger.register(log) initSecurity() val args = new HistoryServerArguments(conf, argStrings) val securityManager = new SecurityManager(conf) |