From c4affa4fa8d95fb765830b1df818ba2bb95a5ff8 Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Fri, 13 Jan 2017 11:16:09 +0100
Subject: change the default classloader used to resolve the config.

---
 kamon-core/src/main/scala/kamon/Kamon.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kamon-core')

diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala
index 7012ed3f..61480073 100644
--- 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)
         )
-- 
cgit v1.2.3