Add folder to store incoming events

This is a debugging aid, triggered by the presence of a configuration
key.

diff --git a/src/main/resources/aquarium.properties b/src/main/resources/aquarium.properties
index e88a743..d71d8b7 100644 (file)
--- a/src/main/resources/aquarium.properties
+++ b/src/main/resources/aquarium.properties
@@ -61,6 +61,8 @@ persistence.password=aquarium
 # another driver is in use
 mongo.connection.pool.size=20
 
+events.store.folder=events
+
 #######
 # DO NOT TOUCH the following options, unless you know what you are doing
 #######

diff --git a/src/main/scala/gr/grnet/aquarium/Configurator.scala b/src/main/scala/gr/grnet/aquarium/Configurator.scala
index 2ab56c6..f1c59a0 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Configurator.scala
+++ b/src/main/scala/gr/grnet/aquarium/Configurator.scala
@@ -152,6 +152,19 @@ class Configurator(val props: Props) extends Loggable {
     }
   }
 
+  private[this] lazy val _eventsStoreFolder: Maybe[File] = {
+    props.get(Keys.events_store_folder) map {
+      folderName ⇒
+        val folder = new File(folderName)
+        folder.mkdirs()
+        if(folder.isDirectory) {
+          folder.getCanonicalFile
+        } else {
+          throw new AquariumException("%s = %s is not a folder".format(Keys.events_store_folder, folder))
+        }
+    }
+  }
+
   private[this] lazy val _resEventProc: ResourceEventProcessorService = new ResourceEventProcessorService
 
   private[this] lazy val _imEventProc: UserEventProcessorService = new UserEventProcessorService
@@ -258,6 +271,10 @@ class Configurator(val props: Props) extends Loggable {
   def getInt(name: String): Maybe[Int] = {
     props.get(name).map(_.toInt)
   }
+
+  def hasEventsStoreFolder = _eventsStoreFolder.isJust
+
+  def eventsStoreFolder = gr.grnet.aquarium.util.justForSure(_eventsStoreFolder).get
 }
 
 object Configurator {
@@ -493,6 +510,10 @@ object Configurator {
      */
     final val time_unit_in_millis = "time.unit.in.seconds"
 
-    final val message_queues_store_folder = "messages"
+    /**
+     * If a value is given to this property, then it represents a folder where all events coming to aquarium are
+     * stored.
+     */
+    final val events_store_folder = "events.store.folder"
   }
 }

diff --git a/src/main/scala/gr/grnet/aquarium/Main.scala b/src/main/scala/gr/grnet/aquarium/Main.scala
index 83bd957..7b7c913 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Main.scala
+++ b/src/main/scala/gr/grnet/aquarium/Main.scala
@@ -83,6 +83,11 @@ object Main extends Loggable {
     logger.info("Starting Aquarium from {}", AQUARIUM_HOME_FOLDER.getCanonicalPath)
 
     val mc = Configurator.MasterConfigurator
+
+    if(mc.hasEventsStoreFolder) {
+      logger.info("{} = {}", Configurator.Keys.events_store_folder, mc.eventsStoreFolder)
+    }
+
     val rl = ResourceLocator
     val HERE = gr.grnet.aquarium.util.justForSure(rl.getResource(".")).get.url.toExternalForm
 

diff --git a/src/test/resources/aquarium.properties b/src/test/resources/aquarium.properties
index 68d8d66..24ac06e 100644 (file)
--- a/src/test/resources/aquarium.properties
+++ b/src/test/resources/aquarium.properties
@@ -62,6 +62,8 @@ persistence.password=aquarium
 # another driver is in use
 mongo.connection.pool.size=20
 
+events.store.folder=events
+
 #######
 # DO NOT TOUCH the following options, unless you know what you are doing
 #######