#1416 Use dedicated queues for long tasks

TheHive-Project · Oct 26, 2020 · 1c5185b · 1c5185b
1 parent 8154c12
commit 1c5185b
Show file tree

Hide file tree

Showing 21 changed files with 414 additions and 372 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -20,7 +20,7 @@ includeCurlyBraceInSelectChains = true
 includeNoParensInSelectChains = true
 
 rewriteTokens {
-  "=>" : "⇒"
-  "<-" : "←"
-  "->": "→"
+  "⇒": "=>"
+  "←": "<-"
+  "→": "->"
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -19,7 +19,7 @@ object Dependencies {
 
     val reflections      = "org.reflections"     % "reflections"         % "0.9.11"
     val zip4j            = "net.lingala.zip4j"   % "zip4j"               % "2.6.0"
-    val elastic4play     = "org.thehive-project" %% "elastic4play"       % "1.12.2-SNAPSHOT"
+    val elastic4play     = "org.thehive-project" %% "elastic4play"       % "1.12.2"
     val akkaCluster      = "com.typesafe.akka"   %% "akka-cluster"       % play.core.PlayVersion.akkaVersion
     val akkaClusterTyped = "com.typesafe.akka"   %% "akka-cluster-typed" % play.core.PlayVersion.akkaVersion
     val akkaClusterTools = "com.typesafe.akka"   %% "akka-cluster-tools" % play.core.PlayVersion.akkaVersion

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.0
+sbt.version=1.3.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,5 +3,5 @@ logLevel := Level.Info
 
 addSbtPlugin("com.typesafe.play"   % "sbt-plugin"           % "2.8.2")
 addSbtPlugin("org.foundweekends"   % "sbt-bintray"          % "0.5.1")
-addSbtPlugin("org.scalameta"       % "sbt-scalafmt"         % "2.4.0")
+addSbtPlugin("org.scalameta"       % "sbt-scalafmt"         % "2.3.0")
 addSbtPlugin("org.thehive-project" % "sbt-github-changelog" % "0.3.0")
diff --git a/thehive-backend/app/connectors/Connectors.scala b/thehive-backend/app/connectors/Connectors.scala
@@ -1,15 +1,16 @@
 package connectors
 
 import scala.collection.immutable
-import play.api.libs.json.{JsObject, Json}
+
+import play.api.libs.json.{ JsObject, Json }
 import play.api.mvc._
 import play.api.routing.sird.UrlContext
-import play.api.routing.{Router, SimpleRouter}
+import play.api.routing.{ Router, SimpleRouter }
+
 import com.google.inject.AbstractModule
-import scala.reflect.runtime.{universe => ru}
-import javax.inject.{Inject, Singleton}
+import javax.inject.{ Inject, Singleton }
 import models.HealthStatus
-import net.codingwell.scalaguice.{ScalaModule, ScalaMultibinder}
+import net.codingwell.scalaguice.{ ScalaModule, ScalaMultibinder }
 
 trait Connector {
   val name: String
@@ -34,7 +35,7 @@ class ConnectorRouter @Inject()(connectors: immutable.Set[Connector], actionBuil
 
 abstract class ConnectorModule extends AbstractModule with ScalaModule {
 
-  def registerController[C <: Connector: ru.TypeTag]: Unit = {
+  def registerController[C <: Connector: Manifest]: Unit = {
     val connectorBindings = ScalaMultibinder.newSetBinder[Connector](binder)
     connectorBindings.addBinding.to[C]
     ()