From f60966b40e052832b4a4f42004c5d0277f35d001 Mon Sep 17 00:00:00 2001 From: Christos KK Loverdos Date: Fri, 1 Jun 2012 15:36:38 +0300 Subject: [PATCH] Print more logging info while starting up --- src/main/scala/gr/grnet/aquarium/Aquarium.scala | 5 +++-- src/main/scala/gr/grnet/aquarium/Main.scala | 2 +- src/main/scala/gr/grnet/aquarium/ResourceLocator.scala | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/scala/gr/grnet/aquarium/Aquarium.scala b/src/main/scala/gr/grnet/aquarium/Aquarium.scala index 6e96df5..a683a3d 100644 --- a/src/main/scala/gr/grnet/aquarium/Aquarium.scala +++ b/src/main/scala/gr/grnet/aquarium/Aquarium.scala @@ -314,8 +314,9 @@ final class Aquarium(val props: Props) extends Lifecycle with Loggable { logger.info("{} = {}", prop.name, prop.rawValue) } - - logger.info("CONF_HERE = {}", CONF_HERE) + logger.info("CONF_HERE = {}", HERE) + logger.info("{} = {}", ResourceLocator.ResourceNames.LOGBACK_XML, LOGBACK_XML) + logger.info("{} = {}", ResourceLocator.ResourceNames.AQUARIUM_PROPERTIES, ResourceLocator.Resources.AquariumPropertiesResource) } private[this] def addShutdownHooks(): Unit = { diff --git a/src/main/scala/gr/grnet/aquarium/Main.scala b/src/main/scala/gr/grnet/aquarium/Main.scala index 2cc7844..02656b1 100644 --- a/src/main/scala/gr/grnet/aquarium/Main.scala +++ b/src/main/scala/gr/grnet/aquarium/Main.scala @@ -37,11 +37,11 @@ package gr.grnet.aquarium import gr.grnet.aquarium.util.date.TimeHelpers import gr.grnet.aquarium.util.LazyLoggable +import gr.grnet.aquarium.ResourceLocator._ /** * Main method for Aquarium * - * @author Georgios Gousios * @author Christos KK Loverdos */ object Main extends LazyLoggable { diff --git a/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala b/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala index 80878f2..ed60433 100644 --- a/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala +++ b/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala @@ -198,12 +198,15 @@ object ResourceLocator { final lazy val AQUARIUM_HOME_CONF_FOLDER = new File(Homes.Folders.AquariumHome, ResourceNames.CONF_FODLER) - final lazy val LOGBACK_XML_FILE = new File(AQUARIUM_HOME_CONF_FOLDER, ResourceNames.LOGBACK_XML) + /** + * This exists in order to have a feeling of where we are. + */ + final lazy val HERE = justForSure(getResource(".")).get.url.toExternalForm /** * This exists in order to have a feeling of where we are. */ - final lazy val CONF_HERE = justForSure(getResource(".")).get.url.toExternalForm + final lazy val LOGBACK_XML = getResource(ResourceNames.LOGBACK_XML).getOr(null) final object Resources { final lazy val AquariumPropertiesResource = { @@ -215,10 +218,7 @@ object ResourceLocator { case Failed(e) ⇒ // On error, fail throw new AquariumInternalError( - "Could not find %s=%s".format( - ResourceLocator.SysProps.Names.AquariumPropertiesPath, - ResourceLocator.SysProps.Names.AquariumPropertiesPath), - e) + "Could not find %s".format(ResourceLocator.SysProps.Names.AquariumPropertiesPath), e) case NoVal ⇒ // Otherwise try other locations -- 1.7.10.4