From 84c365c7ae2eab4c60c49238ac595c216b0c3988 Mon Sep 17 00:00:00 2001
From: wyleung <w.y.leung@e-sensei.nl>
Date: Thu, 5 Jun 2014 16:53:43 +0200
Subject: [PATCH] Raise an error if the JSON file for configs is not properly
formatted in JSON
---
.../src/main/java/nl/lumc/sasc/biopet/core/Config.scala | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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 889b5e60b..61e92f579 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,7 +19,7 @@ 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 found but file does not exist, no global config is loaded")
} else logger.warn("QUEUE_CONFIG value not found, no global config is loaded")
}
@@ -28,6 +28,12 @@ class Config(var map: Map[String,Any]) extends Logging {
def loadConfigFile(configFile:File) {
var returnMap: Map[String,Any] = Map()
var configJson = JSON.parseFull(scala.io.Source.fromFile(configFile).mkString)
+
+ if ( configJson == None ) {
+ println( "[ERROR] The config JSON file is either not properly formatted or not a JSON file" )
+ System.exit(1)
+ }
+
this.logger.debug("Jsonfile: " + configFile)
this.logger.debug("Contain: " + configJson)
configJson.get match {
--
GitLab