diff options
| author | Brian Topping <brian.topping@gmail.com> | 2016-11-04 21:15:33 -0600 |
|---|---|---|
| committer | Diego Parra <diegolparra@gmail.com> | 2016-11-05 05:15:33 +0200 |
| commit | e02d137ab960676cb89ff597bc33915f8b83a4d2 (patch) | |
| tree | 20dd4b7fb99681818f5f73727ea1e70bdf4d1870 | |
| parent | 1bd2fcc712cea984864d5a7e13be81a5f150d236 (diff) | |
| download | Kamon-e02d137ab960676cb89ff597bc33915f8b83a4d2.tar.gz Kamon-e02d137ab960676cb89ff597bc33915f8b83a4d2.tar.bz2 Kamon-e02d137ab960676cb89ff597bc33915f8b83a4d2.zip | |
+ core: update initial config code to not get caught in an error if configs are unresolvable.
+ core: update initial config code to not get caught in an error if configs are unresolvable.
| -rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index 03b0de03..4704ead1 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -16,7 +16,7 @@ package kamon import _root_.akka.actor import _root_.akka.actor._ -import com.typesafe.config.{ Config, ConfigFactory } +import com.typesafe.config.{ Config, ConfigFactory, ConfigParseOptions, ConfigResolveOptions } import kamon.metric._ import kamon.trace.TracerModuleImpl import kamon.util.logger.LazyLogger @@ -76,10 +76,10 @@ object Kamon { } private def resolveConfiguration: Config = { - val defaultConfig = ConfigFactory.load() + val defaultConfig = ConfigFactory.load(this.getClass.getClassLoader, ConfigParseOptions.defaults(), ConfigResolveOptions.defaults().setAllowUnresolved(true)) defaultConfig.getString("kamon.config-provider") match { - case "default" ⇒ defaultConfig + case "default" ⇒ defaultConfig.resolve() case fqcn ⇒ val dynamic = new ReflectiveDynamicAccess(getClass.getClassLoader) dynamic.createInstanceFor[ConfigProvider](fqcn, Nil).get.config |