diff --git a/app/Env.scala b/app/Env.scala index 1ef43af2b6..1f030b71de 100644 --- a/app/Env.scala +++ b/app/Env.scala @@ -53,9 +53,7 @@ final class Env( asyncCache = Env.memo.asyncCache) private def tryDailyPuzzle(): Fu[Option[lila.puzzle.DailyPuzzle]] = - scala.concurrent.Future { - Env.puzzle.daily() - }.flatMap(identity).withTimeoutDefault(100 millis, none)(system) recover { + Env.puzzle.daily.get.withTimeoutDefault(100 millis, none)(system) recover { case e: Exception => lila.log("preloader").warn("daily puzzle", e) none @@ -64,7 +62,8 @@ final class Env( system.actorOf(Props(new actor.Renderer), name = RendererName) lila.log.boot.info("Preloading modules") - lila.common.Chronometer.syncEffect(List(Env.socket, + lila.common.Chronometer.syncEffect(List( + Env.socket, Env.site, Env.tournament, Env.lobby, diff --git a/app/controllers/Puzzle.scala b/app/controllers/Puzzle.scala index 647e63f2a6..91d41db01c 100644 --- a/app/controllers/Puzzle.scala +++ b/app/controllers/Puzzle.scala @@ -38,7 +38,7 @@ object Puzzle extends LilaController { } def daily = Open { implicit ctx => - OptionFuResult(env.daily() flatMap { + OptionFuResult(env.daily.get flatMap { _.map(_.id) ?? env.api.puzzle.find }) { puzzle => negotiate( @@ -214,7 +214,7 @@ object Puzzle extends LilaController { } def frame = Open { implicit ctx => - OptionOk(env.daily()) { daily => + OptionOk(env.daily.get) { daily => html.puzzle.embed(daily) } } diff --git a/modules/puzzle/src/main/Daily.scala b/modules/puzzle/src/main/Daily.scala index 7327cc3ee2..c0cd0d5347 100644 --- a/modules/puzzle/src/main/Daily.scala +++ b/modules/puzzle/src/main/Daily.scala @@ -21,7 +21,7 @@ private[puzzle] final class Daily( f = find, expireAfter = _.ExpireAfterWrite(10 minutes)) - def apply: Fu[Option[DailyPuzzle]] = cache.get + def get: Fu[Option[DailyPuzzle]] = cache.get private def find: Fu[Option[DailyPuzzle]] = (findCurrent orElse findNew) recover { case e: Exception => diff --git a/modules/puzzle/src/main/Env.scala b/modules/puzzle/src/main/Env.scala index 8837679d02..dd543e4f8b 100644 --- a/modules/puzzle/src/main/Env.scala +++ b/modules/puzzle/src/main/Env.scala @@ -60,8 +60,7 @@ final class Env( puzzleColl, renderer, asyncCache = asyncCache, - system.scheduler - ).apply _ + system.scheduler) def cli = new lila.common.Cli { def process = {