diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-01-13 11:25:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-13 11:25:15 +0100 |
commit | 6e0868fca75c7bb2648d1df1994cd43292cb0ba8 (patch) | |
tree | ad329f926a34f947784bcfc1dc51ec449ca5c739 /kamon-core/src/main/scala/kamon/metric/MetricsModule.scala | |
parent | f089e1dd50fc0fe9989f38e038962be488ec54ff (diff) | |
parent | c4affa4fa8d95fb765830b1df818ba2bb95a5ff8 (diff) | |
download | Kamon-6e0868fca75c7bb2648d1df1994cd43292cb0ba8.tar.gz Kamon-6e0868fca75c7bb2648d1df1994cd43292cb0ba8.tar.bz2 Kamon-6e0868fca75c7bb2648d1df1994cd43292cb0ba8.zip |
Merge pull request #422 from ivantopo/wip/421-ensure-that-start-stop-works
allow restarting Kamon in the same process.
Diffstat (limited to 'kamon-core/src/main/scala/kamon/metric/MetricsModule.scala')
-rwxr-xr-x | kamon-core/src/main/scala/kamon/metric/MetricsModule.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala b/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala index 75ef0851..864b7a0b 100755 --- a/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala +++ b/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala @@ -234,7 +234,7 @@ private[kamon] class MetricsModuleImpl(config: Config) extends MetricsModule { private val _trackedEntities = TrieMap.empty[Entity, EntityRecorder] private val _subscriptions = new LazyActorRef - val settings = MetricsSettings(config) + @volatile var settings = MetricsSettings(config) def shouldTrack(entity: Entity): Boolean = settings.entityFilters.get(entity.category).map { @@ -360,7 +360,8 @@ private[kamon] class MetricsModuleImpl(config: Config) extends MetricsModule { settings.pointScheduler(DefaultRefreshScheduler(_system.scheduler, _system.dispatcher)) } - def start(system: ActorSystem): Unit = synchronized { + def start(system: ActorSystem, newConfig: Config): Unit = synchronized { + settings = MetricsSettings(newConfig) _system = system _start _system = null |