diff --git a/conf/base.conf b/conf/base.conf index 7b35fc4219..1c71eae516 100644 --- a/conf/base.conf +++ b/conf/base.conf @@ -675,7 +675,6 @@ hub { round = ${round.socket.name} tournament = ${tournament.socket.name} simul = ${simul.socket.name} - hub = ${socket.hub.name} } channel { round.move_time = ${round.channel.move_time.name} @@ -685,7 +684,6 @@ hub { } socket { - hub.name = socket.hub move_broadcast.name = socket.move-broadcast user_register.name = socket.user-register population.name = socket.population diff --git a/modules/hub/src/main/Env.scala b/modules/hub/src/main/Env.scala index 35016897a9..06a09b807c 100644 --- a/modules/hub/src/main/Env.scala +++ b/modules/hub/src/main/Env.scala @@ -39,7 +39,6 @@ final class Env(config: Config, system: ActorSystem) { // val tournament = select("socket.tournament") val simul = select("socket.simul") val site = select("socket.site") - val hub = select("socket.hub") } private def select(name: String) = diff --git a/modules/socket/src/main/Env.scala b/modules/socket/src/main/Env.scala index 063e52d2f2..1f5bd4c3c2 100644 --- a/modules/socket/src/main/Env.scala +++ b/modules/socket/src/main/Env.scala @@ -13,12 +13,11 @@ final class Env( import scala.concurrent.duration._ - private val HubName = config getString "hub.name" private val MoveBroadcastName = config getString "move_broadcast.name" private val UserRegisterName = config getString "user_register.name" private val PopulationName = config getString "population.name" - private val socketHub = system.actorOf(Props[SocketHub], name = HubName) + private val socketHub = system.actorOf(Props[SocketHub]) private val population = system.actorOf(Props[Population], name = PopulationName)