Merge pull request #30 from tpetr/master

add JSON support for /v1/endpoints (fixes #28)
d2iq-archive · Sep 17, 2013 · 3f084eb · 3f084eb
2 parents 35cf445 + 81f31c6
commit 3f084eb
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/scala/mesosphere/marathon/api/v1/EndpointsResource.scala b/src/main/scala/mesosphere/marathon/api/v1/EndpointsResource.scala
@@ -11,12 +11,12 @@ import mesosphere.marathon.tasks.TaskTracker
  */
 
 @Path("v1/endpoints")
-@Produces(Array(MediaType.TEXT_PLAIN))
 class EndpointsResource @Inject()(
     schedulerService: MarathonSchedulerService,
     taskTracker: TaskTracker) {
 
   @GET
+  @Produces(Array(MediaType.TEXT_PLAIN))
   def endpoints() = {
     val sb = new StringBuilder
     for (app <- schedulerService.listApps()) {
@@ -29,4 +29,12 @@ class EndpointsResource @Inject()(
     }
     sb.toString()
   }
+
+  @GET
+  @Produces(Array(MediaType.APPLICATION_JSON))
+  def endpointsJson() = {
+    for (app <- schedulerService.listApps) yield {
+      Map("id" -> app.id, "instances" -> taskTracker.get(app.id))
+    }
+  }
 }