diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2019-03-18 13:44:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 13:44:50 +0100 |
| commit | 8efb3b408a876a3dfdac79580773279125cb4135 (patch) | |
| tree | 96fd746fc13f4ffb914d8e59c4ea074513877556 /kamon-core/src/main/scala/kamon/Kamon.scala | |
| parent | e311df4b3a272f4f160857f718a96ec316a2fc06 (diff) | |
| parent | ec83a72879378bc9eedea24f828e4d30fed95e92 (diff) | |
| download | Kamon-8efb3b408a876a3dfdac79580773279125cb4135.tar.gz Kamon-8efb3b408a876a3dfdac79580773279125cb4135.tar.bz2 Kamon-8efb3b408a876a3dfdac79580773279125cb4135.zip | |
Merge pull request #569 from ivantopo/status-page
Status page
Diffstat (limited to 'kamon-core/src/main/scala/kamon/Kamon.scala')
| -rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index ab95d773..8b2b64e6 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -22,7 +22,8 @@ object Kamon extends ClassLoading with Tracing with ModuleLoading with ContextPropagation - with ContextStorage { + with ContextStorage + with Status { @volatile private var _environment = Environment.fromConfig(config()) @@ -31,6 +32,6 @@ object Kamon extends ClassLoading _environment onReconfigure(newConfig => { - _environment = Environment.fromConfig(config) + _environment = Environment.fromConfig(newConfig) }) -} +}
\ No newline at end of file |