From bf9d9946f97782c9212420123b4a042918d7df5e Mon Sep 17 00:00:00 2001
From: Tyson <thamilton@verticalscope.com>
Date: Wed, 9 Jan 2013 11:29:22 -0500
Subject: [PATCH] Query parameter reformatted to be more extensible and routing
more robust
---
core/src/main/scala/spark/deploy/master/MasterWebUI.scala | 6 +++---
core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/src/main/scala/spark/deploy/master/MasterWebUI.scala b/core/src/main/scala/spark/deploy/master/MasterWebUI.scala
index dfec1d1dc5..a96b55d6f3 100644
--- a/core/src/main/scala/spark/deploy/master/MasterWebUI.scala
+++ b/core/src/main/scala/spark/deploy/master/MasterWebUI.scala
@@ -22,13 +22,13 @@ class MasterWebUI(val actorSystem: ActorSystem, master: ActorRef) extends Direct
val handler = {
get {
- (path("") & parameters('json ?)) {
- case Some(js) =>
+ (path("") & parameters('format ?)) {
+ case Some(js) if js.equalsIgnoreCase("json") =>
val future = master ? RequestMasterState
respondWithMediaType(MediaTypes.`application/json`) { ctx =>
ctx.complete(future.mapTo[MasterState])
}
- case None =>
+ case _ =>
completeWith {
val future = master ? RequestMasterState
future.map {
diff --git a/core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala b/core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala
index a168f54ca0..84b6c16bd6 100644
--- a/core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala
+++ b/core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala
@@ -21,14 +21,14 @@ class WorkerWebUI(val actorSystem: ActorSystem, worker: ActorRef) extends Direct
val handler = {
get {
- (path("") & parameters('json ?)) {
- case Some(js) => {
+ (path("") & parameters('format ?)) {
+ case Some(js) if js.equalsIgnoreCase("json") => {
val future = worker ? RequestWorkerState
respondWithMediaType(MediaTypes.`application/json`) { ctx =>
ctx.complete(future.mapTo[WorkerState])
}
}
- case None =>
+ case _ =>
completeWith{
val future = worker ? RequestWorkerState
future.map { workerState =>
--
GitLab