diff options
Diffstat (limited to 'src/main/scala/com/drivergrp/core/config.scala')
| -rw-r--r-- | src/main/scala/com/drivergrp/core/config.scala | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/scala/com/drivergrp/core/config.scala b/src/main/scala/com/drivergrp/core/config.scala index ac4c609..29cd9ed 100644 --- a/src/main/scala/com/drivergrp/core/config.scala +++ b/src/main/scala/com/drivergrp/core/config.scala @@ -3,18 +3,16 @@ package com.drivergrp.core import java.io.File import com.typesafe.config.{Config, ConfigFactory} - object config { def loadDefaultConfig: Config = { - val configDefaults = - ConfigFactory.load(this.getClass.getClassLoader, "application.conf") + val configDefaults = ConfigFactory.load(this.getClass.getClassLoader, "application.conf") scala.sys.props.get("application.config") match { case Some(filename) => val configFile = new File(filename) - if(configFile.exists()) { + if (configFile.exists()) { ConfigFactory.parseFile(configFile).withFallback(configDefaults) } else { throw new IllegalStateException(s"No config found at $filename") |