Merge pull request #21815 from akka/wip-21674-patriknw

Handle early termination of system when starting logger, #21674
2016-11-16 21:30:43 +01:00 · 2016-11-16 21:30:43 +01:00 · aa142ef83b
commit aa142ef83b
parent 96a1d2a081 cbcfbfbccd
1 changed files with 5 additions and 3 deletions
--- a/akka-typed/src/main/scala/akka/typed/internal/EventStreamImpl.scala
+++ b/akka-typed/src/main/scala/akka/typed/internal/EventStreamImpl.scala
@ -190,9 +190,11 @@ private[typed] class EventStreamImpl(private val debug: Boolean)(implicit privat
      }
    } catch {
      case e: Exception ⇒
-        System.err.println("error while starting up loggers")
-        e.printStackTrace()
-        throw new akka.ConfigurationException("Could not start logger due to [" + e.toString + "]")
+        if (!system.whenTerminated.isCompleted) {
+          System.err.println("error while starting up loggers")
+          e.printStackTrace()
+          throw new akka.ConfigurationException("Could not start logger due to [" + e.toString + "]")
+        }
    }
  }