Improved error reporting if failed to start

diff --git a/src/main/scala/gr/grnet/aquarium/Configurator.scala b/src/main/scala/gr/grnet/aquarium/Configurator.scala
index 3a27c6c..766dec6 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Configurator.scala
+++ b/src/main/scala/gr/grnet/aquarium/Configurator.scala
@@ -363,14 +363,12 @@ object Configurator {
 
       case NoVal ⇒
         throw new AquariumInternalError(
-          "Could not load %s from %s".format(
-            ResourceLocator.ResourceNames.AQUARIUM_PROPERTIES,
+          "Could not create Aquarium configuration from %s".format(
             AquariumPropertiesResource))
 
       case Failed(e) ⇒
         throw new AquariumInternalError(
-          "Could not load %s from %s".format(
-            ResourceLocator.ResourceNames.AQUARIUM_PROPERTIES,
+          "Could not create Aquarium configuration from %s".format(
             AquariumPropertiesResource),
           e)
     }

diff --git a/src/main/scala/gr/grnet/aquarium/Main.scala b/src/main/scala/gr/grnet/aquarium/Main.scala
index f965178..cdfd770 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Main.scala
+++ b/src/main/scala/gr/grnet/aquarium/Main.scala
@@ -37,7 +37,7 @@ package gr.grnet.aquarium
 
 import com.ckkloverdos.sys.SysProp
 import gr.grnet.aquarium.util.date.TimeHelpers
-import gr.grnet.aquarium.util.LazyLoggable
+import gr.grnet.aquarium.util.{LogHelpers, LazyLoggable}
 
 /**
  * Main method for Aquarium
@@ -114,9 +114,16 @@ object Main extends LazyLoggable {
     configureLogging()
 
     logStarting("Aquarium")
-    val (ms0, ms1, _) = TimeHelpers.timed {
+    val ms0 = TimeHelpers.nowMillis()
+    try {
       doStart()
+      val ms1 = TimeHelpers.nowMillis()
+      logStarted(ms0, ms1, "Aquarium")
+    } catch {
+      case e: Throwable ⇒
+      logger.error("Aquarium not started\n%s".format(gr.grnet.aquarium.util.chainOfCausesForLogging(e, 1)), e)
+      throw e
     }
-    logStarted(ms0, ms1, "Aquarium")
+
   }
 }
\ No newline at end of file