change the default classloader used to resolve the config.

kamon-io · Jan 13, 2017 · c4affa4 · c4affa4
1 parent becf6ca
commit c4affa4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala
@@ -76,14 +76,14 @@ object Kamon {
 
     def shutdown(): Unit = {
       if (started) {
-        actorSystem.terminate()
+        actorSystem.shutdown()
       }
     }
 
     private def defaultConfig = {
       patchConfiguration(
         ConfigFactory.load(
-          this.getClass.getClassLoader,
+          Thread.currentThread().getContextClassLoader(),
           ConfigParseOptions.defaults(),
           ConfigResolveOptions.defaults().setAllowUnresolved(true)
         )