Move HttpEnv to Global object and prepare for actors

app/Global.scala

@@ -4,8 +4,18 @@ import play.api._
 import play.api.mvc._
 import play.api.mvc.Results._
 
+import lila.system.SystemEnv
+
 object Global extends GlobalSettings {
 
+  private[this] var systemEnv: SystemEnv = _
+
+  def env = Option(systemEnv) err "The environment is not ready"
+
+  override def onStart(app: Application) {
+    systemEnv = new SystemEnv(app.configuration.underlying)
+  }
+
   override def onHandlerNotFound(request: RequestHeader): Result = {
     NotFound("Not found " + request)
   }

app/HttpEnv.scala

@@ -1,12 +0,0 @@
-package lila.http
-
-import lila.system.SystemEnv
-
-import play.api.Play
-
-object HttpEnv {
-
-  lazy val static = new SystemEnv {
-    protected val config = Play.unsafeApplication.configuration.underlying
-  }
-}

app/controllers/LilaController.scala

@@ -13,7 +13,7 @@ import scalaz.effects.IO
 
 trait LilaController extends Controller with ContentTypes {
 
-  lazy val env = HttpEnv.static
+  lazy val env = Global.env
 
   def JsonOk(map: Map[String, Any]) = Ok(Json generate map) as JSON
 

conf/application.conf

@@ -26,6 +26,10 @@ crafty {
   book_path = "/usr/share/crafty"
 }
 
+akka {
+  debug.receive = on
+}
+
 application.secret="CiebwjgIM9cHQ;I?Xk:sfqDJ;BhIe:jsL?r=?IPF[saf>s^r0]?0grUq4>q?5mP^"
 
 application.langs="en"

system/src/main/scala/Syncer.scala

@@ -69,6 +69,5 @@ final class Syncer(
     wait(max(1, duration / sleep))
   }
 
-  //private val failMap = Map("failMap" -> true)
-  private val failMap = Map("fuck" -> true)
+  private val failMap = Map("reload" -> true)
 }

system/src/main/scala/SystemEnv.scala

@@ -7,9 +7,7 @@ import db._
 import ai._
 import memo._
 
-trait SystemEnv {
-
-  protected val config: Config
+final class SystemEnv(config: Config) {
 
   def server = new Server(
     repo = gameRepo,
@@ -63,9 +61,9 @@ trait SystemEnv {
 
 object SystemEnv extends EnvBuilder {
 
-  def apply(overrides: String = "") = new SystemEnv {
-    val config = makeConfig(overrides, "/home/thib/lila/conf/application.conf")
-  }
+  def apply(overrides: String = "") = new SystemEnv(
+    makeConfig(overrides, "/home/thib/lila/conf/application.conf")
+  )
 }
 
 trait EnvBuilder {