Improve graceful shutdown (close #12)

snowplow · Dec 6, 2021 · b7bcfe3 · b7bcfe3
1 parent 91b8ee7
commit b7bcfe3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf
@@ -1,5 +1,6 @@
 enableDefaultRedirect = false
 enableStartupChecks = true
+terminationDeadline = 10.seconds
 
 paths {
 
@@ -74,4 +75,4 @@ telemetry {
 
 streams {
     useIpAddressAsPartitionKey = false
-}
+}
diff --git a/core/src/main/scala/com.snowplowanalytics.snowplow.collectors.scalastream/Collector.scala b/core/src/main/scala/com.snowplowanalytics.snowplow.collectors.scalastream/Collector.scala
@@ -131,6 +131,7 @@ trait Collector {
     ): Future[Unit] =
       builder
         .bind(rs)
+        .map(_.addToCoordinatedShutdown(collectorConf.terminationDeadline))
         .map { binding =>
           log.info(s"REST interface bound to ${binding.localAddress}")
         }

diff --git a/core/src/main/scala/com.snowplowanalytics.snowplow.collectors.scalastream/model.scala b/core/src/main/scala/com.snowplowanalytics.snowplow.collectors.scalastream/model.scala
@@ -182,7 +182,8 @@ package model {
     telemetry: Option[TelemetryConfig],
     ssl: SSLConfig = SSLConfig(),
     enableDefaultRedirect: Boolean,
-    enableStartupChecks: Boolean
+    enableStartupChecks: Boolean,
+    terminationDeadline: FiniteDuration
   ) {
     val cookieConfig = if (cookie.enabled) Some(cookie) else None
     val doNotTrackHttpCookie =

diff --git a/core/src/test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/TestUtils.scala b/core/src/test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/TestUtils.scala
@@ -61,6 +61,7 @@ object TestUtils {
       telemetry             = None,
       prometheusMetrics     = PrometheusMetricsConfig(false, None),
       enableStartupChecks   = true,
-      enableDefaultRedirect = false
+      enableDefaultRedirect = false,
+      terminationDeadline   = 10.seconds
     )
 }
diff --git a/.../test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/config/ConfigSpec.scala b/.../test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/config/ConfigSpec.scala
@@ -81,6 +81,7 @@ abstract class ConfigSpec extends Specification {
     ssl                   = SSLConfig(enable = false, redirect = false, port = 443),
     enableDefaultRedirect = false,
     enableStartupChecks   = true,
+    terminationDeadline   = 10.seconds,
     streams = StreamsConfig(
       good                       = "good",
       bad                        = "bad",