Config: reuse existing preTerminationPeriod instead of new shutdownTi…

…meout
snowplow · Aug 17, 2023 · 85668f6 · 85668f6
1 parent 96b0761
commit 85668f6
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 26 deletions.
diff --git a/examples/config.kafka.extended.hocon b/examples/config.kafka.extended.hocon
@@ -266,9 +266,6 @@ collector {
       maxCycles = 3
     }
   }
-
-  # When the shutdown gets interrupted, the app continues to serve requests for this duration
-  shutdownTimeout = 5 minutes
 }
 
 # Akka has a variety of possible configuration options defined at

diff --git a/examples/config.kinesis.extended.hocon b/examples/config.kinesis.extended.hocon
@@ -305,9 +305,6 @@ collector {
       maxCycles = 3
     }
   }
-
-  # When the shutdown gets interrupted, the app continues to serve requests for this duration
-  shutdownTimeout = 5 minutes
 }
 
 # Akka has a variety of possible configuration options defined at

diff --git a/examples/config.nsq.extended.hocon b/examples/config.nsq.extended.hocon
@@ -244,9 +244,6 @@ collector {
       maxCycles = 3
     }
   }
-
-  # When the shutdown gets interrupted, the app continues to serve requests for this duration
-  shutdownTimeout = 5 minutes
 }
 
 # Akka has a variety of possible configuration options defined at

diff --git a/examples/config.pubsub.extended.hocon b/examples/config.pubsub.extended.hocon
@@ -275,9 +275,6 @@ collector {
       maxCycles = 3
     }
   }
-
-  # When the shutdown gets interrupted, the app continues to serve requests for this duration
-  shutdownTimeout = 5 minutes
 }
 
 # Akka has a variety of possible configuration options defined at

diff --git a/examples/config.rabbitmq.extended.hocon b/examples/config.rabbitmq.extended.hocon
@@ -262,9 +262,6 @@ collector {
       maxCycles = 3
     }
   }
-
-  # When the shutdown gets interrupted, the app continues to serve requests for this duration
-  shutdownTimeout = 5 minutes
 }
 
 # Akka has a variety of possible configuration options defined at

diff --git a/examples/config.sqs.extended.hocon b/examples/config.sqs.extended.hocon
@@ -287,9 +287,6 @@ collector {
       maxCycles = 3
     }
   }
-
-  # When the shutdown gets interrupted, the app continues to serve requests for this duration
-  shutdownTimeout = 5 minutes
 }
 
 # Akka has a variety of possible configuration options defined at

diff --git a/examples/config.stdout.extended.hocon b/examples/config.stdout.extended.hocon
@@ -251,9 +251,6 @@ collector {
       maxCycles = 3
     }
   }
-
-  # When the shutdown gets interrupted, the app continues to serve requests for this duration
-  shutdownTimeout = 5 minutes
 }
 
 # Akka has a variety of possible configuration options defined at

diff --git a/http4s/src/main/resources/reference.conf b/http4s/src/main/resources/reference.conf
@@ -81,5 +81,5 @@ collector {
 
   redirectDomains = []
 
-  shutdownTimeout = 5 minutes
-}
+  preTerminationPeriod = 10 seconds
+}
diff --git a/http4s/src/main/scala/com.snowplowanalytics.snowplow.collector.core/Config.scala b/http4s/src/main/scala/com.snowplowanalytics.snowplow.collector.core/Config.scala
@@ -26,7 +26,7 @@ case class Config[+SinkConfig](
   ssl: Config.SSL,
   enableDefaultRedirect: Boolean,
   redirectDomains: Set[String],
-  shutdownTimeout: FiniteDuration
+  preTerminationPeriod: FiniteDuration
 )
 
 object Config {

diff --git a/http4s/src/main/scala/com.snowplowanalytics.snowplow.collector.core/Run.scala b/http4s/src/main/scala/com.snowplowanalytics.snowplow.collector.core/Run.scala
@@ -64,7 +64,7 @@ object Run {
         config.interface,
         config.port
       )
-      _ <- withGracefulShutdown(config.shutdownTimeout)(httpServer)
+      _ <- withGracefulShutdown(config.preTerminationPeriod)(httpServer)
     } yield ()
 
     resources.surround(Async[F].never[ExitCode])

diff --git a/http4s/src/test/scala/com.snowplowanalytics.snowplow.collector.core/TestUtils.scala b/http4s/src/test/scala/com.snowplowanalytics.snowplow.collector.core/TestUtils.scala
@@ -102,6 +102,6 @@ object TestUtils {
     ),
     enableDefaultRedirect = false,
     redirectDomains       = Set.empty[String],
-    shutdownTimeout       = 5.minutes
+    preTerminationPeriod  = 5.minutes
   )
 }