fix(server): start HttpApi explicitly

actorapp · Jan 11, 2016 · 7cd9887 · 7cd9887
1 parent e031158
commit 7cd9887
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/actor-server/actor-http-api/src/main/scala/im/actor/server/api/http/HttpApiFrontend.scala b/actor-server/actor-http-api/src/main/scala/im/actor/server/api/http/HttpApiFrontend.scala
@@ -39,8 +39,6 @@ final class HttpApi(_system: ActorSystem) extends Extension {
     }
   }
 
-  HttpApiFrontend.start(system.settings.config)
-
   val authenticator: AsyncAuthenticator[Boolean] = {
     case p @ Credentials.Provided(_) ⇒
       for {
@@ -51,6 +49,9 @@ final class HttpApi(_system: ActorSystem) extends Extension {
 
   val adminAuthenticator: AsyncAuthenticator[Unit] =
     authenticator andThen (_ map (isAdminOpt ⇒ if (isAdminOpt.isDefined) Some(()) else None))
+
+  def start(): Unit =
+    HttpApiFrontend.start(system.settings.config)
 }
 
 object HttpApi extends ExtensionId[HttpApi] with ExtensionIdProvider {

diff --git a/actor-server/actor-server-sdk/src/main/scala/im/actor/server/ActorServer.scala b/actor-server/actor-server-sdk/src/main/scala/im/actor/server/ActorServer.scala
@@ -266,7 +266,7 @@ final case class ActorServerBuilder(defaultConfig: Config = ConfigFactory.empty(
       Frontend.start(serverConfig)
 
       system.log.debug("Starting Http Api")
-      HttpApi(system)
+      HttpApi(system).start()
 
       ActorServer(system)
     } catch {