diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-01-13 11:16:09 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2017-01-13 11:16:09 +0100 |
| commit | c4affa4fa8d95fb765830b1df818ba2bb95a5ff8 (patch) | |
| tree | 049cc90001236b4bbf6659b1f8ad2ee95a3a2a62 | |
| parent | becf6cac7142011cc478ab7ab15d51799b190951 (diff) | |
| download | Kamon-c4affa4fa8d95fb765830b1df818ba2bb95a5ff8.tar.gz Kamon-c4affa4fa8d95fb765830b1df818ba2bb95a5ff8.tar.bz2 Kamon-c4affa4fa8d95fb765830b1df818ba2bb95a5ff8.zip | |
change the default classloader used to resolve the config.
| -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) ) |