diff options
| -rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 4 |
1 files changed, 2 insertions, 2 deletions
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) ) |