clean up after removing relation actor

Aphexus · Apr 6, 2020 · 1c6d422 · 1c6d422
1 parent 2cf0cf6
commit 1c6d422
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 18 deletions.
diff --git a/conf/base.conf b/conf/base.conf
@@ -171,9 +171,6 @@ relation {
   collection {
     relation = relation
   }
-  actor {
-    name = relation
-  }
   limit {
     follow = 400
     block = 500
@@ -492,7 +489,6 @@ hub {
       user = ${timeline.user.actor.name}
     }
     bookmark = ${bookmark.actor.name}
-    relation = ${relation.actor.name}
     report = ${report.actor.name}
     shutup = ${shutup.actor.name}
     mod = ${mod.actor.name}

diff --git a/modules/common/src/main/mon.scala b/modules/common/src/main/mon.scala
@@ -338,13 +338,6 @@ object mon {
     val unfollow  = c.withTag("type", "unfollow")
     val block     = c.withTag("type", "block")
     val unblock   = c.withTag("type", "unblock")
-    object actor {
-      val computeMovement     = timer("relation.actor.computeMovement.time").withoutTags
-      val computeMovementSync = timer("relation.actor.computeMovementSync.time").withoutTags
-      val reloadFriends       = timer("relation.actor.reloadFriends.time").withoutTags
-      val gameStateChanged    = timer("relation.actor.gameStateChanged.time").withoutTags
-      val studyStateChanged   = timer("relation.actor.studyStateChanged.time").withoutTags
-    }
   }
   object coach {
     object pageView {

diff --git a/modules/hub/src/main/Env.scala b/modules/hub/src/main/Env.scala
@@ -19,7 +19,6 @@ object actors {
   case class Shutup(actor: ActorSelection)        extends Actor
   case class Mod(actor: ActorSelection)           extends Actor
   case class Notification(actor: ActorSelection)  extends Actor
-  case class Relation(actor: ActorSelection)      extends Actor
   case class Timeline(actor: ActorSelection)      extends Actor
   case class Report(actor: ActorSelection)        extends Actor
   case class Renderer(actor: ActorSelection)      extends Actor
@@ -45,7 +44,6 @@ final class Env(
   val tournamentApi = TournamentApi(select("actor.tournament.api"))
   val timeline      = Timeline(select("actor.timeline.user"))
   val bookmark      = Bookmark(select("actor.bookmark"))
-  val relation      = Relation(select("actor.relation"))
   val report        = Report(select("actor.report"))
   val shutup        = Shutup(select("actor.shutup"))
   val mod           = Mod(select("actor.mod"))

diff --git a/modules/relation/src/main/Env.scala b/modules/relation/src/main/Env.scala
@@ -11,7 +11,6 @@ import lila.hub.actors
 @Module
 private class RelationConfig(
     @ConfigName("collection.relation") val collection: CollName,
-    @ConfigName("actor.name") val actorName: String,
     @ConfigName("limit.follow") val maxFollow: Max,
     @ConfigName("limit.block") val maxBlock: Max
 )
@@ -20,14 +19,10 @@ private class RelationConfig(
 final class Env(
     appConfig: Configuration,
     db: lila.db.Db,
-    relation: actors.Relation,
     timeline: actors.Timeline,
     userRepo: lila.user.UserRepo,
-    onlineUserIds: lila.socket.OnlineIds,
-    lightUserSync: lila.common.LightUser.GetterSync,
     prefApi: lila.pref.PrefApi,
     cacheApi: lila.memo.CacheApi,
-    settingStore: lila.memo.SettingStore.Builder
 )(implicit ec: scala.concurrent.ExecutionContext, system: ActorSystem) {
 
   private val config = appConfig.get[RelationConfig]("relation")(AutoConfig.loader)