#1429 Force the initialisation of the cluster before the schema updater

TheHive-Project · Jul 9, 2020 · 94d70b7 · 94d70b7
1 parent eb464f7
commit 94d70b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/thehive/app/org/thp/thehive/ClusterSetup.scala b/thehive/app/org/thp/thehive/ClusterSetup.scala
@@ -14,12 +14,8 @@ import scala.concurrent.Future
 class ClusterSetup @Inject() (
     configuration: Configuration,
     system: ActorSystem,
-    applicationLifeCycle: ApplicationLifecycle,
-    db: Database,
     injector: Injector
 ) {
-  applicationLifeCycle
-    .addStopHook(() => Future.successful(db.close()))
   if (configuration.get[Seq[String]]("akka.cluster.seed-nodes").isEmpty) {
     val logger: Logger = Logger(getClass)
     logger.info("Initialising cluster")

diff --git a/thehive/app/org/thp/thehive/models/SchemaUpdaterActor.scala b/thehive/app/org/thp/thehive/models/SchemaUpdaterActor.scala
@@ -7,6 +7,7 @@ import akka.util.Timeout
 import javax.inject.{Inject, Provider, Singleton}
 import org.thp.scalligraph.janus.JanusDatabase
 import org.thp.scalligraph.models.Database
+import org.thp.thehive.ClusterSetup
 import org.thp.thehive.services.LocalUserSrv
 import play.api.Logger
 
@@ -18,7 +19,8 @@ import scala.util.{Failure, Try}
 class DatabaseProvider @Inject() (
     database: Database,
     theHiveSchema: TheHiveSchemaDefinition,
-    actorSystem: ActorSystem
+    actorSystem: ActorSystem,
+    clusterSetup: ClusterSetup
 ) extends Provider[Database] {
   import SchemaUpdaterActor._
   lazy val schemaUpdaterActor: ActorRef = {