try running on coordinated-shutdown, more logging

Author: andrew-nowak

thrall/app/ThrallComponents.scala

@@ -12,6 +12,7 @@ import controllers.{AssetsComponents, HealthCheck, ReaperController, ThrallContr
 import lib._
 import lib.elasticsearch._
 import lib.kinesis.{KinesisConfig, ThrallEventConsumer}
+import org.apache.pekko.actor.CoordinatedShutdown
 import org.apache.pekko.stream.KillSwitch
 import play.api.ApplicationLoader.Context
 import router.Routes
@@ -73,11 +74,11 @@ class ThrallComponents(context: Context) extends GridComponents(context, new Thr
   )
 
   private val streamRunning: Future[Done] = thrallStreamProcessor.run()
+  streamRunning.onComplete(_ => logger.info("Thrall streams completed"))
 
-  applicationLifecycle.addStopHook(() => {
+  coordinatedShutdown.addTask(CoordinatedShutdown.PhaseServiceRequestsDone, "shutdown-thrall-streams")(() => {
     logger.info("thrall stream is closing; saying byebye")
     thrallStreamProcessor.killSwitch.shutdown()
-
     streamRunning
   })
 

thrall/app/lib/ThrallStreamProcessor.scala

@@ -130,7 +130,7 @@ class ThrallStreamProcessor(
 
     stream.onComplete {
       case Failure(exception) => logger.error("Thrall stream completed with failure", exception)
-      case Success(_) => logger.info("Thrall stream completed with done, probably shutting down")
+      case Success(Done) => logger.info("Thrall stream completed with done, probably shutting down")
     }
 
     stream