Reenable custom logging configurarion loading

diff --git a/src/main/resources/aquarium.properties b/src/main/resources/aquarium.properties
index 76e7133..2d1db38 100644 (file)
--- a/src/main/resources/aquarium.properties
+++ b/src/main/resources/aquarium.properties
@@ -43,7 +43,7 @@ rest.port=8888
 ### Message store related settings
 
 # Hostname for the persistence service
-mongodb.host=localhost
+mongodb.host=127.0.0.1
 
 # Port for connecting to the persistence service
 mongodb.port=27017

diff --git a/src/main/scala/gr/grnet/aquarium/Main.scala b/src/main/scala/gr/grnet/aquarium/Main.scala
index 02656b1..0e1abca 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Main.scala
+++ b/src/main/scala/gr/grnet/aquarium/Main.scala
@@ -38,6 +38,10 @@ package gr.grnet.aquarium
 import gr.grnet.aquarium.util.date.TimeHelpers
 import gr.grnet.aquarium.util.LazyLoggable
 import gr.grnet.aquarium.ResourceLocator._
+import org.slf4j.LoggerFactory
+import ch.qos.logback.classic.LoggerContext
+import ch.qos.logback.classic.joran.JoranConfigurator
+import com.ckkloverdos.maybe.Just
 
 /**
  * Main method for Aquarium
@@ -48,6 +52,20 @@ object Main extends LazyLoggable {
   private[this] def configureLogging(): Unit = {
     // Make sure AQUARIUM_HOME is configured, since it is used in logback.xml
     assert(ResourceLocator.Homes.Folders.AquariumHome.isDirectory)
+
+    ResourceLocator.LOGBACK_XML match {
+      case Just(resource) ⇒
+        val f = LoggerFactory.getILoggerFactory
+        f match {
+          case context: LoggerContext ⇒
+            val joran = new JoranConfigurator
+            joran.setContext(context)
+            context.reset()
+            joran.doConfigure(resource.url)
+        }
+
+      case _ ⇒
+    }
   }
 
   def doStart(): Unit = {

diff --git a/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala b/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala
index ed60433..378dda0 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala
+++ b/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala
@@ -206,7 +206,7 @@ object ResourceLocator {
   /**
    * This exists in order to have a feeling of where we are.
    */
-  final lazy val LOGBACK_XML = getResource(ResourceNames.LOGBACK_XML).getOr(null)
+  final lazy val LOGBACK_XML = getResource(ResourceNames.LOGBACK_XML)
 
   final object Resources {
     final lazy val AquariumPropertiesResource = {