diff options
author | pj.fanning <pj.fanning@workday.com> | 2017-03-14 01:05:27 +0000 |
---|---|---|
committer | pj.fanning <pj.fanning@workday.com> | 2017-03-14 01:05:27 +0000 |
commit | 1bc1d08b34d0bb0fb8842a1417968395c13763b5 (patch) | |
tree | 3e77fccdd468cadced53a530f2a5625ef7690413 /kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala | |
parent | 7d4178fabce892fdb64b09fd16693a3d3f3ac240 (diff) | |
download | Kamon-1bc1d08b34d0bb0fb8842a1417968395c13763b5.tar.gz Kamon-1bc1d08b34d0bb0fb8842a1417968395c13763b5.tar.bz2 Kamon-1bc1d08b34d0bb0fb8842a1417968395c13763b5.zip |
[issue 443] actor system terminate
Diffstat (limited to 'kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala')
-rw-r--r-- | kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala index a615dde4..995f15fa 100644 --- a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala +++ b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala @@ -19,7 +19,7 @@ package kamon.testkit import akka.actor.ActorSystem import akka.testkit.{ImplicitSender, TestKitBase} import com.typesafe.config.Config -import kamon.Kamon +import kamon.{ActorSystemTools, Kamon} import kamon.metric.{Entity, EntitySnapshot, SubscriptionsDispatcher} import kamon.trace.TraceContext import kamon.util.LazyActorRef @@ -27,7 +27,7 @@ import org.scalatest.{BeforeAndAfterAll, Matchers, WordSpecLike} abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with WordSpecLike with Matchers with ImplicitSender with BeforeAndAfterAll { lazy val collectionContext = Kamon.metrics.buildDefaultCollectionContext - implicit lazy val system: ActorSystem = { + override implicit lazy val system: ActorSystem = { Kamon.start(mergedConfig) ActorSystem(actorSystemName, mergedConfig) } @@ -65,6 +65,6 @@ abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with W override protected def afterAll(): Unit = { Kamon.shutdown() - system.shutdown() + ActorSystemTools.terminateActorSystem(system) } } |