Merge pull request #2359 from eikek/2358-fix-server-startup

Fix http server startup

modules/common/src/main/scala/docspell/common/util/ResourceUse.scala

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package docspell.common.util
+
+import cats.effect._
+import cats.syntax.all._
+import fs2._
+import fs2.concurrent.{Signal, SignallingRef}
+
+object ResourceUse {
+  def apply[F[_]: Concurrent, A](
+      resource: Resource[F, A]
+  ): Implicits.UseSyntax[F, A] =
+    new Implicits.UseSyntax(resource)
+
+  object Implicits {
+    implicit final class UseSyntax[F[_]: Concurrent, A](resource: Resource[F, A]) {
+
+      /** Evaluates `resource` endlessly or until the signal turns `true`. */
+      def useUntil(
+          signal: Signal[F, Boolean],
+          returnValue: Ref[F, ExitCode]
+      ): F[ExitCode] = {
+        val server = Stream.resource(resource)
+        val blockUntilTrue = signal.discrete.takeWhile(_ == false).drain
+        val exit = fs2.Stream.eval(returnValue.get)
+        (server *> (blockUntilTrue ++ exit)).compile.lastOrError
+      }
+
+      def useForever(implicit ev: Async[F]): F[ExitCode] = for {
+        termSignal <- SignallingRef.of[F, Boolean](false)
+        exitValue <- Ref.of(ExitCode.Success)
+        rc <- useUntil(termSignal, exitValue)
+      } yield rc
+    }
+  }
+}

modules/joex/src/main/scala/docspell/joex/JoexServer.scala

@@ -14,6 +14,7 @@ import fs2.io.net.Network
 
 import docspell.backend.msg.Topics
 import docspell.common.Pools
+import docspell.common.util.ResourceUse.Implicits._
 import docspell.joex.routes._
 import docspell.pubsub.naive.NaivePubSub
 import docspell.store.Store
@@ -74,15 +75,14 @@ object JoexServer {
 
     Stream
       .resource(app)
-      .flatMap { app =>
+      .evalMap { app =>
-        Stream.resource {
+        EmberServerBuilder
-          EmberServerBuilder
+          .default[F]
-            .default[F]
+          .withHost(cfg.bind.address)
-            .withHost(cfg.bind.address)
+          .withPort(cfg.bind.port)
-            .withPort(cfg.bind.port)
+          .withHttpApp(app.httpApp)
-            .withHttpApp(app.httpApp)
+          .build
-            .build
+          .useUntil(app.termSig, app.exitRef)
-        }
       }
   }.drain
 }

modules/restserver/src/main/scala/docspell/restserver/RestServer.scala

@@ -58,24 +58,16 @@ object RestServer {
             Stream(
               restApp.subscriptions,
               restApp.eventConsume(maxConcurrent = 2),
-              Stream.resource {
+              Stream.eval {
-                if (cfg.serverOptions.enableHttp2)
+                EmberServerBuilder
-                  EmberServerBuilder
+                  .default[F]
-                    .default[F]
+                  .withHost(cfg.bind.address)
-                    .withHost(cfg.bind.address)
+                  .withPort(cfg.bind.port)
-                    .withPort(cfg.bind.port)
+                  .withMaxConnections(cfg.serverOptions.maxConnections)
-                    .withMaxConnections(cfg.serverOptions.maxConnections)
+                  .withHttpWebSocketApp(createHttpApp(setting, pubSub, restApp))
-                    .withHttpWebSocketApp(createHttpApp(setting, pubSub, restApp))
+                  .toggleHttp2(cfg.serverOptions.enableHttp2)
-                    .withHttp2
+                  .build
-                    .build
+                  .useForever
-                else
-                  EmberServerBuilder
-                    .default[F]
-                    .withHost(cfg.bind.address)
-                    .withPort(cfg.bind.port)
-                    .withMaxConnections(cfg.serverOptions.maxConnections)
-                    .withHttpWebSocketApp(createHttpApp(setting, pubSub, restApp))
-                    .build
               }
             )
           }
@@ -164,4 +156,9 @@ object RestServer {
       ).pure[F]
     }
   }
+
+  implicit final class EmberServerBuilderExt[F[_]](self: EmberServerBuilder[F]) {
+    def toggleHttp2(flag: Boolean) =
+      if (flag) self.withHttp2 else self.withoutHttp2
+  }
 }