fix gearpump#498, worker rest data is not updated in UI

clockfly · clockfly · commit a478e377089a · 2015-02-16T11:14:18.000+08:00
diff --git a/services/src/main/scala/org/apache/gearpump/services/MasterService.scala b/services/src/main/scala/org/apache/gearpump/services/MasterService.scala
@@ -1,9 +1,8 @@
 package org.apache.gearpump.services
 
 import akka.actor.ActorRef
-import org.apache.gearpump.cluster.AppMasterToMaster.{MasterData, GetMasterData, WorkerData, GetWorkerData}
-import org.apache.gearpump.cluster.MasterToAppMaster.WorkerList
-import org.apache.gearpump.util.Constants
+import org.apache.gearpump.cluster.AppMasterToMaster.{MasterData, GetMasterData}
+import org.apache.gearpump.util.{Constants}
 import spray.http.StatusCodes
 import spray.routing.HttpService
 
diff --git a/services/src/main/scala/org/apache/gearpump/services/RestServices.scala b/services/src/main/scala/org/apache/gearpump/services/RestServices.scala
@@ -20,6 +20,7 @@ package org.apache.gearpump.services
 
 import akka.actor.{Actor, ActorRef, ActorSystem, Props}
 import akka.io.IO
+import org.apache.gearpump.util.LogUtil
 import spray.can._
 import spray.routing.RoutingSettings
 
diff --git a/services/src/main/scala/org/apache/gearpump/services/WorkersService.scala b/services/src/main/scala/org/apache/gearpump/services/WorkersService.scala
@@ -23,7 +23,8 @@ import akka.pattern._
 import org.apache.gearpump.cluster.AppMasterToMaster.{WorkerData, GetWorkerData, GetAllWorkers}
 import org.apache.gearpump.cluster.MasterToAppMaster.{WorkerList, AppMastersData}
 import org.apache.gearpump.cluster.worker.WorkerDescription
-import org.apache.gearpump.util.Constants
+import org.apache.gearpump.util.{LogUtil, Constants}
+import org.slf4j.Logger
 import spray.http.StatusCodes
 import spray.routing.HttpService
 
@@ -38,7 +39,8 @@ trait WorkersService extends HttpService {
     implicit val ec: ExecutionContext = actorRefFactory.dispatcher
     implicit val timeout = Constants.FUTURE_TIMEOUT
     path("workers") {
-      val workerDataFuture = (master ? GetAllWorkers).asInstanceOf[Future[WorkerList]].flatMap { workerList =>
+
+      def workerDataFuture = (master ? GetAllWorkers).asInstanceOf[Future[WorkerList]].flatMap { workerList =>
         val workers = workerList.workers
         val workerDataList = List.empty[WorkerDescription]
         Future.fold(workers.map(master ? GetWorkerData(_)))(workerDataList) { (workerDataList, workerData) =>
diff --git a/services/src/test/scala/org/apache/gearpump/services/MasterServiceSpec.scala b/services/src/test/scala/org/apache/gearpump/services/MasterServiceSpec.scala
@@ -21,21 +21,15 @@ package org.apache.gearpump.services
 import org.apache.gearpump.cluster.AppMasterToMaster.MasterData
 import org.apache.gearpump.cluster.TestUtil
 import org.apache.gearpump.cluster.TestUtil.MiniCluster
-import org.apache.gearpump.util.LogUtil
 import org.scalatest.{BeforeAndAfterAll, FlatSpec, Matchers}
-import org.slf4j.Logger
 import spray.testkit.ScalatestRouteTest
 
 import scala.concurrent.duration._
-import scala.util.{Failure, Success}
-
 
 class MasterServiceSpec extends FlatSpec with ScalatestRouteTest with MasterService with Matchers with BeforeAndAfterAll {
 
   import upickle._
 
-  private val LOG: Logger = LogUtil.getLogger(getClass)
-
   def actorRefFactory = system
 
   var miniCluster:MiniCluster = null
diff --git a/services/src/test/scala/org/apache/gearpump/services/WorkerServiceSpec.scala b/services/src/test/scala/org/apache/gearpump/services/WorkerServiceSpec.scala
@@ -18,27 +18,21 @@
 
 package org.apache.gearpump.services
 
-import org.apache.gearpump.cluster.AppMasterToMaster.WorkerData
-import org.apache.gearpump.cluster.MasterToAppMaster.WorkerList
 import org.apache.gearpump.cluster.TestUtil
 import org.apache.gearpump.cluster.TestUtil.MiniCluster
 import org.apache.gearpump.cluster.worker.WorkerDescription
 
 import org.apache.gearpump.util.LogUtil
 import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach, Matchers, FlatSpec}
-import org.slf4j.Logger
 import spray.testkit.ScalatestRouteTest
 
 import scala.concurrent.duration._
-import scala.util.{Failure, Success}
 
 class WorkerServiceSpec extends FlatSpec with ScalatestRouteTest with WorkersService with WorkerService
 with Matchers with BeforeAndAfterAll {
 
   import upickle._
 
-  private val LOG: Logger = LogUtil.getLogger(getClass)
-
   def actorRefFactory = system
 
   var miniCluster:MiniCluster = null
