1 files changed, 30 insertions, 0 deletions
diff --git a/kamon-core/src/main/scala/kamon/ActorSystemTools.scala b/kamon-core/src/main/scala/kamon/ActorSystemTools.scala
new file mode 100644
index 00000000..31c8e7e7
--- /dev/null
+++ b/kamon-core/src/main/scala/kamon/ActorSystemTools.scala
@@ -0,0 +1,30 @@
+/* =========================================================================================
+ * Copyright © 2013-2016 the kamon project <http://kamon.io/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ * =========================================================================================
+ */
+package kamon
+
+import scala.util.control.NonFatal
+
+import akka.actor.ActorSystem
+
+object ActorSystemTools {
+  //first try akka 2.4 system terminate() and then failover to akka 2.3 system shutdown()
+  private[kamon] def terminateActorSystem(system: ActorSystem): Unit = {
+    try {
+      system.terminate()
+    } catch {
+      case NonFatal(e) => system.shutdown()
+    }
+  }
+}