diff --git a/biopet-framework/src/main/java/nl/lumc/sasc/biopet/core/Config.scala b/biopet-framework/src/main/java/nl/lumc/sasc/biopet/core/Config.scala index ca97f607b39edcb696beb1d0df2fe5e392704c2b..36dc7b4f56277588586d851e57a6a9a35c6b4af5 100644 --- a/biopet-framework/src/main/java/nl/lumc/sasc/biopet/core/Config.scala +++ b/biopet-framework/src/main/java/nl/lumc/sasc/biopet/core/Config.scala @@ -19,8 +19,8 @@ class Config(var map: Map[String,Any]) extends Logging { logger.info("Loading config file: " + file) loadConfigFile(file) } - else logger.warn("QUEUE_CONFIG value found but file does not exist, no global config is loaded") - } else logger.warn("QUEUE_CONFIG value not found, no global config is loaded") + else logger.warn("BIOPET_CONFIG value found but file does not exist, no global config is loaded") + } else logger.info("BIOPET_CONFIG value not found, no global config is loaded") } def contains(s:String) : Boolean = map.contains(s) @@ -29,7 +29,7 @@ class Config(var map: Map[String,Any]) extends Logging { var returnMap: Map[String,Any] = Map() var configJson = JSON.parseFull(scala.io.Source.fromFile(configFile).mkString) - if ( configJson == None ) { + if (configJson == None) { throw new IllegalStateException("The config JSON file is either not properly formatted or not a JSON file, file: " + configFile) }