remove analysis socket

app/controllers/UserAnalysis.scala

@@ -95,12 +95,6 @@ object UserAnalysis extends LilaController with TheftPrevention {
  }
  }
 
- def socket(apiVersion: Int) = SocketOption { implicit ctx =>
- getSocketSri("sri") ?? { sri =>
- Env.analyse.socketHandler.join(sri, ctx.me, apiVersion) map some
- }
- }
-
  // XHR only
  def pgn = OpenBody { implicit ctx =>
  implicit val req = ctx.body

conf/base.conf

@@ -190,9 +190,6 @@ bookmark {
  actor.name = bookmark
 }
 analyse {
- socket {
- sri.ttl = ${site.socket.sri.ttl}
- }
  collection.analysis = analysis2
  collection.requester = analysis_requester
  net.domain = ${net.domain}

conf/routes

@@ -98,8 +98,6 @@ POST /training/:id/attempt controllers.Puzzle.round(id: Int)
 
 # User Analysis
 # mobile app sends no site socket version: default to v3
-GET /analysis/socket controllers.UserAnalysis.socket(apiVersion: Int = 3)
-GET /analysis/socket/v:apiVersion controllers.UserAnalysis.socket(apiVersion: Int)
 GET /analysis/help controllers.UserAnalysis.help
 GET /analysis/*something controllers.UserAnalysis.parse(something: String)
 GET /analysis controllers.UserAnalysis.index

modules/analyse/src/main/Env.scala

@@ -6,16 +6,13 @@ import com.typesafe.config.Config
 final class Env(
  config: Config,
  db: lila.db.Env,
- system: ActorSystem,
- evalCacheHandler: lila.evalCache.EvalCacheSocketHandler,
- hub: lila.hub.Env,
+ bus: lila.common.Bus,
  indexer: ActorSelection
 ) {
 
  private val CollectionAnalysis = config getString "collection.analysis"
  private val CollectionRequester = config getString "collection.requester"
  private val NetDomain = config getString "net.domain"
- private val SocketSriTtl = config duration "socket.sri.ttl"
 
  lazy val analysisColl = db(CollectionAnalysis)
 
@@ -24,24 +21,18 @@ final class Env(
  lazy val analyser = new Analyser(
  indexer = indexer,
  requesterApi = requesterApi,
- bus = system.lilaBus
+ bus = bus
  )
 
  lazy val annotator = new Annotator(NetDomain)
-
- private val socket = new AnalyseSocket(system, SocketSriTtl)
-
- lazy val socketHandler = new AnalyseSocketHandler(socket, hub, evalCacheHandler)
 }
 
 object Env {
 
  lazy val current = "analyse" boot new Env(
  config = lila.common.PlayApp loadConfig "analyse",
  db = lila.db.Env.current,
- system = lila.common.PlayApp.system,
- evalCacheHandler = lila.evalCache.Env.current.socketHandler,
- hub = lila.hub.Env.current,
+ bus = lila.common.PlayApp.system.lilaBus,
  indexer = lila.hub.Env.current.gameSearch
  )
 }