fix gearpump#510， add log directory for UI server.

clockfly · clockfly · commit b3c61a6fd568 · 2015-02-16T17:58:28.000+08:00
diff --git a/conf/log4j.properties b/conf/log4j.properties
@@ -32,6 +32,9 @@ gearpump.worker.log.file=gearpump-worker-${HOSTNAME}.log
 # Log file name for local daemon process
 gearpump.local.log.file=gearpump-local-${HOSTNAME}.log
 
+# Log file name for UI daemon process
+gearpump.ui.log.file=gearpump-ui-${HOSTNAME}.log
+
 # The username of an application submitter, will be overwritten by GearPump at runtime.
 gearpump.username=user
 # The application logger setting
diff --git a/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala b/core/src/main/scala/org/apache/gearpump/util/LogUtil.scala
@@ -13,7 +13,7 @@ import scala.util.Try
 object LogUtil {
   object ProcessType extends Enumeration {
     type ProcessType = Value
-    val MASTER, WORKER, LOCAL, APPLICATION = Value
+    val MASTER, WORKER, LOCAL, APPLICATION, UI = Value
   }
 
   def getLogger[T](clazz : Class[T], context : String = null, master : Any = null, worker : Any = null, executor : Any = null, task : Any = null, app : Any = null) : Logger = {
diff --git a/services/dashboard/scripts/app-02.js b/services/dashboard/scripts/app-02.js
@@ -39,7 +39,7 @@ angular.module('app-02', ['adf', 'app.widgets.visdag'])
               type: "visdag",
               config: {
               },
-              title: "DAG"
+              title: "DAG(Click AppId on the left to show the DAG)"
             }
           ]
         }]
diff --git a/services/src/main/scala/org/apache/gearpump/cluster/main/Services.scala b/services/src/main/scala/org/apache/gearpump/cluster/main/Services.scala
@@ -19,13 +19,22 @@
 package org.apache.gearpump.cluster.main
 
 import akka.actor.{ActorSystem, Props}
+import org.apache.gearpump.cluster.main.Local._
 import org.apache.gearpump.cluster.master.MasterProxy
 import org.apache.gearpump.cluster.{ClusterConfig, UserConfig}
 import org.apache.gearpump.services.{RestServices,WebSocketServices}
 import org.apache.gearpump.util.Constants._
-import org.apache.gearpump.util.Util
+import org.apache.gearpump.util.LogUtil.ProcessType
+import org.apache.gearpump.util.{LogUtil, Util}
+import org.slf4j.Logger
 
 object Services extends App with ArgumentsParser {
+  val systemConfig = ClusterConfig.load.master.withFallback(ClusterConfig.load.worker)
+
+  private val LOG: Logger = {
+    LogUtil.loadConfiguration(systemConfig, ProcessType.UI)
+    LogUtil.getLogger(getClass)
+  }
 
   override val options: Array[(String, CLIOption[Any])] = Array(
     "master" -> CLIOption[String]("<host1:port1,host2:port2,host3:port3>", required = true))
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.services.WebSocketServices._
 import org.apache.gearpump.util.LogUtil
 import spray.can._
 import spray.routing.RoutingSettings
@@ -41,12 +42,17 @@ class RestServicesActor(masters: ActorRef, sys:ActorSystem) extends Actor with R
 }
 
 object RestServices {
+  private val LOG = LogUtil.getLogger(getClass)
+
   def start(master:ActorRef)(implicit system:ActorSystem) {
     implicit val executionContext = system.dispatcher
     val services = system.actorOf(Props(classOf[RestServicesActor], master, system), "rest-services")
     val config = system.settings.config
     val port = config.getInt("gearpump.services.http")
     val host = config.getString("gearpump.services.host")
     IO(Http) ! Http.Bind(services, interface = host, port = port)
+
+    LOG.info(s"Please browser http://$host:$port to see the web UI")
+    println(s"Please browser http://$host:$port to see the web UI")
   }
 }
diff --git a/services/src/main/scala/org/apache/gearpump/services/WebSocketServices.scala b/services/src/main/scala/org/apache/gearpump/services/WebSocketServices.scala
@@ -21,6 +21,10 @@ package org.apache.gearpump.services
 import akka.actor._
 import akka.io.IO
 import org.apache.gearpump.cluster.ClusterConfig
+import org.apache.gearpump.cluster.main.Local._
+import org.apache.gearpump.util.LogUtil
+import org.apache.gearpump.util.LogUtil.ProcessType
+import org.slf4j.Logger
 import spray.can.Http
 import spray.can.server.UHttp
 
@@ -35,6 +39,7 @@ class WebSocketServices(masters: ActorRef) extends Actor with ActorLogging {
 }
 
 object WebSocketServices {
+
   def start(master:ActorRef) {
     implicit val system = ActorSystem("ws-services" , ClusterConfig.load.application)
     implicit val executionContext = system.dispatcher

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import scala.util.Try`
`13`	`13`	`object LogUtil {`
`14`	`14`	`object ProcessType extends Enumeration {`
`15`	`15`	`type ProcessType = Value`
`16`		`- val MASTER, WORKER, LOCAL, APPLICATION = Value`
	`16`	`+ val MASTER, WORKER, LOCAL, APPLICATION, UI = Value`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`def getLogger[T](clazz : Class[T], context : String = null, master : Any = null, worker : Any = null, executor : Any = null, task : Any = null, app : Any = null) : Logger = {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ angular.module('app-02', ['adf', 'app.widgets.visdag'])`
`39`	`39`	`type: "visdag",`
`40`	`40`	`config: {`
`41`	`41`	`},`
`42`		`- title: "DAG"`
	`42`	`+ title: "DAG(Click AppId on the left to show the DAG)"`
`43`	`43`	`}`
`44`	`44`	`]`
`45`	`45`	`}]`