Common treatment of Start/Stop logging

diff --git a/src/main/scala/gr/grnet/aquarium/Configurator.scala b/src/main/scala/gr/grnet/aquarium/Configurator.scala
index 3d5416e..1e77d84 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Configurator.scala
+++ b/src/main/scala/gr/grnet/aquarium/Configurator.scala
@@ -192,7 +192,7 @@ class Configurator(val props: Props) extends Loggable {
     }
   }
 
-  private[this] lazy val _resEventProc: ResourceEventProcessorService = new ResourceEventProcessorService
+  private[this] lazy val _resEventProc = new ResourceEventProcessorService
 
   private[this] lazy val _imEventProc = new IMEventProcessorService
 

diff --git a/src/main/scala/gr/grnet/aquarium/actor/provider/SimpleLocalActorProvider.scala b/src/main/scala/gr/grnet/aquarium/actor/provider/SimpleLocalActorProvider.scala
index 6c00349..d06a296 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/provider/SimpleLocalActorProvider.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/provider/SimpleLocalActorProvider.scala
@@ -70,7 +70,7 @@ class SimpleLocalActorProvider extends ActorProvider with Configurable with Logg
       val ms0 = TimeHelpers.nowMillis
       actorForRole(role)
       val ms1 = TimeHelpers.nowMillis
-      logger.info("%s/%s (+). Started actor for role %s in %.3f sec".format(index + 1, Size, role, (ms1 - ms0).toDouble / 1000.0))
+      logger.info("%s/%s (+). Started actor for role %s in %.3f sec".format(index + 1, Size, role, TimeHelpers.secDiffOfMillis(ms0, ms1)))
     }
 
     // Now that all actors have been started, send them some initialization code

diff --git a/src/main/scala/gr/grnet/aquarium/service/EventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/service/EventProcessorService.scala
index 17e61e4..fefa682 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/service/EventProcessorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/service/EventProcessorService.scala
@@ -137,7 +137,7 @@ abstract class EventProcessorService[E <: AquariumEvent] extends AkkaAMQP with L
         val exchange = i(0)
         val route = i(1)
         val qname = i(2)
-        logger.info("Declaring queue %s (%s -> %s)".format(qname, exchange, route))
+        logger.info("Declaring queue '%s' for exchange '%s' and key '%s'".format(qname, exchange, route))
         consumer(route, qname, exchange, queueReaderManager.lb, false)
     }
   }

diff --git a/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala
index f408840..40eb921 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/service/IMEventProcessorService.scala
@@ -40,10 +40,11 @@ import com.ckkloverdos.maybe.{Maybe, NoVal, Failed, Just}
 import gr.grnet.aquarium.actor.DispatcherRole
 import gr.grnet.aquarium.Configurator.Keys
 import gr.grnet.aquarium.store.LocalFSEventStore
-import gr.grnet.aquarium.util.makeString
 import gr.grnet.aquarium.Configurator
 import gr.grnet.aquarium.actor.message.service.dispatcher.ProcessUserEvent
 import gr.grnet.aquarium.events.IMEvent
+import gr.grnet.aquarium.util.date.TimeHelpers
+import gr.grnet.aquarium.util.{LogHelpers, makeString}
 
 /**
  * An event processor service for user events coming from the IM system
@@ -116,14 +117,19 @@ class IMEventProcessorService extends EventProcessorService[IMEvent] {
   override def queueReaderManager = queueReader
 
   def start() {
-    logger.info("Starting user event processor service")
-    declareQueues(Keys.amqp_userevents_queues)
+    logStarting()
+    val (ms0, ms1, _) = TimeHelpers.timed {
+      declareQueues(Keys.amqp_userevents_queues)
+    }
+    logStarted(ms0, ms1)
   }
 
   def stop() {
-    queueReaderManager.stop()
-    persisterManager.stop()
-
-    logger.info("Stopping user event processor service")
+    logStopping()
+    val (ms0, ms1, _) = TimeHelpers.timed {
+      queueReaderManager.stop()
+      persisterManager.stop()
+    }
+    logStopped(ms0, ms1)
   }
 }
\ No newline at end of file

diff --git a/src/main/scala/gr/grnet/aquarium/service/RESTActorService.scala b/src/main/scala/gr/grnet/aquarium/service/RESTActorService.scala
index d6c01ff..6fe763e 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/service/RESTActorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/service/RESTActorService.scala
@@ -39,7 +39,8 @@ import gr.grnet.aquarium.Configurator
 import gr.grnet.aquarium.actor.RESTRole
 import _root_.akka.actor._
 import cc.spray.can.{ServerConfig, HttpClient, HttpServer}
-import gr.grnet.aquarium.util.{Loggable, Lifecycle}
+import gr.grnet.aquarium.util.date.TimeHelpers
+import gr.grnet.aquarium.util.{LogHelpers, Loggable, Lifecycle}
 
 /**
  * REST service based on Actors and Spray.
@@ -56,15 +57,23 @@ class RESTActorService extends Lifecycle with Loggable {
     val mc = Configurator.MasterConfigurator
     this._port = mc.props.getInt(Configurator.Keys.rest_port).getOr(
       throw new Exception("%s was not specified in aquarium properties".format(Configurator.Keys.rest_port)))
-    logger.info("Starting on port {}", this._port)
-    this._restActor = mc.actorProvider.actorForRole(RESTRole)
-    // Start Spray subsystem
-    this._serverActor = Actor.actorOf(new HttpServer(ServerConfig(port = this._port))).start()
-    this._clientActor = Actor.actorOf(new HttpClient()).start()
+
+    LogHelpers.logStarting(logger, "on port %s", this._port)
+    val (ms0, ms1, _) = TimeHelpers.timed {
+      this._restActor = mc.actorProvider.actorForRole(RESTRole)
+      // Start Spray subsystem
+      this._serverActor = Actor.actorOf(new HttpServer(ServerConfig(port = this._port))).start()
+      this._clientActor = Actor.actorOf(new HttpClient()).start()
+    }
+    LogHelpers.logStarted(logger, ms0, ms1)
   }
 
   def stop(): Unit = {
-    this._serverActor ! PoisonPill
-    this._clientActor ! PoisonPill
+    LogHelpers.logStopping(logger)
+    val (ms0, ms1, _) = TimeHelpers.timed {
+      this._serverActor ! PoisonPill
+      this._clientActor ! PoisonPill
+    }
+    LogHelpers.logStopped(logger, ms0, ms1)
   }
 }
\ No newline at end of file

diff --git a/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala b/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala
index 48389ed..de5b9cf 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala
+++ b/src/main/scala/gr/grnet/aquarium/service/ResourceEventProcessorService.scala
@@ -41,6 +41,7 @@ import gr.grnet.aquarium.store.LocalFSEventStore
 import com.ckkloverdos.maybe.{Maybe, Just, Failed, NoVal}
 import gr.grnet.aquarium.actor.message.service.dispatcher.ProcessResourceEvent
 import gr.grnet.aquarium.events.ResourceEvent
+import gr.grnet.aquarium.util.date.TimeHelpers
 
 
 /**
@@ -108,14 +109,19 @@ final class ResourceEventProcessorService extends EventProcessorService[Resource
   override def queueReaderManager = queueReader
 
   def start() {
-    logger.info("Starting resource event processor service")
-    declareQueues(Keys.amqp_resevents_queues)
+    logStarting()
+    val (ms0, ms1, _) = TimeHelpers.timed {
+      declareQueues(Keys.amqp_resevents_queues)
+    }
+    logStarted(ms0, ms1)
   }
 
   def stop() {
-    queueReaderManager.stop()
-    persisterManager.stop()
-
-    logger.info("Stopping resource event processor service")
+    logStopping()
+    val (ms0, ms1, _) = TimeHelpers.timed {
+      queueReaderManager.stop()
+      persisterManager.stop()
+    }
+    logStopped(ms0, ms1)
   }
 }
\ No newline at end of file