From 4ca753b0014a3da2635d2b6314b1231e1eee8f9c Mon Sep 17 00:00:00 2001
From: Peter van 't Hof <p.j.van_t_hof@lumc.nl>
Date: Mon, 9 Jun 2014 17:20:23 +0200
Subject: [PATCH] Changed env variable for config to BIOPET_CONFIG
---
.../src/main/java/nl/lumc/sasc/biopet/core/Config.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 ca97f607b..36dc7b4f5 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)
}
--
GitLab