You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/07/05 02:33:13 UTC
git commit: Added SignalLogger to HistoryServer.
Repository: spark
Updated Branches:
refs/heads/master fc7165893 -> 0db5d5a22
Added SignalLogger to HistoryServer.
This was omitted in #1260. @aarondav
Author: Reynold Xin <rx...@apache.org>
Closes #1300 from rxin/historyServer and squashes the following commits:
af720a3 [Reynold Xin] Added SignalLogger to HistoryServer.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0db5d5a2
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0db5d5a2
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0db5d5a2
Branch: refs/heads/master
Commit: 0db5d5a22ef8dd6e3fbb2759cd25aac46bdf2ce9
Parents: fc71658
Author: Reynold Xin <rx...@apache.org>
Authored: Fri Jul 4 17:33:07 2014 -0700
Committer: Reynold Xin <rx...@apache.org>
Committed: Fri Jul 4 17:33:07 2014 -0700
----------------------------------------------------------------------
.../scala/org/apache/spark/deploy/history/HistoryServer.scala | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0db5d5a2/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala
----------------------------------------------------------------------
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 29a78a5..56b38dd 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)