Merge pull request #314 from ulitol97/master

Customizable stream timeout in Docker.
weso · May 13, 2022 · c08856b · c08856b
2 parents 169b426 + c34941c
commit c08856b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/modules/server/src/main/scala/es/weso/rdfshape/server/Server.scala b/modules/server/src/main/scala/es/weso/rdfshape/server/Server.scala
@@ -179,6 +179,11 @@ object Server {
     */
   val defaultVerbosity = 0
 
+  /** Environment variable checked by the app to know how long to keep waiting for
+    * items coming via stream
+    */
+  val envVarStreamTimeout = "STREAM_TIMEOUT"
+
   /** System property checked by the app to know how long to keep waiting for
     * items coming via stream
     */

diff --git a/...rver/api/routes/schema/logic/operations/stream/transformations/CometTransformations.scala b/...rver/api/routes/schema/logic/operations/stream/transformations/CometTransformations.scala
@@ -4,6 +4,7 @@ import cats.effect.IO
 import com.typesafe.scalalogging.LazyLogging
 import es.weso.rdfshape.server.Server.{
   defaultStreamTimeout,
+  envVarStreamTimeout,
   systemPropertyStreamTimeout
 }
 import es.weso.rdfshape.server.api.routes.schema.logic.operations.stream.configuration.{
@@ -56,10 +57,19 @@ private[schema] object CometTransformations extends LazyLogging {
     * Retrieved from a system property which can be overridden by CLI args.
     */
   private lazy val timeout = {
-    val timeoutFromSystemProp =
-      Integer
-        .getInteger(systemPropertyStreamTimeout, defaultStreamTimeout)
-        .toLong
+    val timeoutFromSystemProp = {
+      // Try to fetch in env vars
+      Option(System.getenv(envVarStreamTimeout))
+        .flatMap(_.toIntOption)
+        .map(_.toLong)
+        // Else fetch from system properties, resorting to the default value
+        // if none is found/parseable
+        .getOrElse(
+          Integer
+            .getInteger(systemPropertyStreamTimeout, defaultStreamTimeout)
+            .toLong
+        )
+    }
 
     FiniteDuration(timeoutFromSystemProp, SECONDS)
   }