diff options
| author | Tyson <thamilton@verticalscope.com> | 2013-01-09 11:29:22 -0500 |
|---|---|---|
| committer | Tyson <thamilton@verticalscope.com> | 2013-01-09 11:29:58 -0500 |
| commit | bf9d9946f97782c9212420123b4a042918d7df5e (patch) | |
| tree | 35adc4e835492512229f27d0b30106b9b123c012 /core | |
| parent | 0da2ff102e1e8ac50059252a153a1b9b3e74b6b8 (diff) | |
| download | spark-bf9d9946f97782c9212420123b4a042918d7df5e.tar.gz spark-bf9d9946f97782c9212420123b4a042918d7df5e.tar.bz2 spark-bf9d9946f97782c9212420123b4a042918d7df5e.zip | |
Query parameter reformatted to be more extensible and routing more robust
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/deploy/master/MasterWebUI.scala | 6 | ||||
| -rw-r--r-- | 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 => |