deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

fix websocket handling on production

Browse source
This commit is contained in:
Thibault Duplessis 2013-05-29 11:09:50 +02:00
parent 62ab267d00
commit ce1276a19f
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Global.scala
View file

@ -1,11 +1,10 @@
package lila.app
// import lila.app.Env
import lila.hub.actorApi.monitor.AddRequest
import play.api.{ Application, GlobalSettings, Mode }
import play.api.mvc._
import play.api.mvc.Results._
import play.api.{ Application, GlobalSettings, Mode }
import lila.hub.actorApi.monitor.AddRequest
object Global extends GlobalSettings {
@ -19,7 +18,7 @@ object Global extends GlobalSettings {
else Action(NotFound("I am an AI server")).some
}
else {
if (!Env.api.isProd) println(req)
// if (!Env.api.isProd) println(req)
Env.monitor.reporting ! AddRequest
Env.security.wiretap(req)
Env.security.firewall.requestHandler(req).await orElse
@ -42,4 +41,5 @@ object Global extends GlobalSettings {
super.onError(request, ex)
)
)
}

2
modules/i18n/src/main/I18nRequestHandler.scala
View file

@ -7,7 +7,7 @@ import play.api.mvc.{ Action, RequestHeader, Handler }
final class I18nRequestHandler(pool: I18nPool, protocol: String) {
def apply(req: RequestHeader): Option[Handler] =
if (req.host contains ":9000") None
if (req.host startsWith "socket.") None
else pool.domainLang(req).isDefined.fold(
None,
Action {

2
public/javascripts/monitor.js
View file

@ -174,7 +174,7 @@
}
var sri = Math.random().toString(36).substring(5);
var wsUrl = "ws://" + document.domain + ":9000/monitor/socket?sri=" + sri;
var wsUrl = "ws://socket." + document.domain + "/monitor/socket?sri=" + sri;
var ws = window.MozWebSocket ? new MozWebSocket(wsUrl) : new WebSocket(wsUrl);
ws.onmessage = function(e) {
var m = JSON.parse(e.data);