aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/com/drivergrp/core/config.scala
diff options
context:
space:
mode:
authorvlad <vlad@drivergrp.com>2016-07-18 18:00:26 -0400
committervlad <vlad@drivergrp.com>2016-07-18 18:00:26 -0400
commitc2bf3f05366b37a0de47a000c171910fa0965d58 (patch)
tree0dc41038af60889b047636fe6e4e3ae02a0186c7 /src/main/scala/com/drivergrp/core/config.scala
parent87e6769bbb51bdd9aff4b7c35e09283f1f71d45e (diff)
downloaddriver-core-c2bf3f05366b37a0de47a000c171910fa0965d58.tar.gz
driver-core-c2bf3f05366b37a0de47a000c171910fa0965d58.tar.bz2
driver-core-c2bf3f05366b37a0de47a000c171910fa0965d58.zip
Added scalafmt to core
Diffstat (limited to 'src/main/scala/com/drivergrp/core/config.scala')
-rw-r--r--src/main/scala/com/drivergrp/core/config.scala6
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")