go-packages/iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-03-15 05:26:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix multi websocket servers https://github.com/kataras/iris/issues/365

Browse Source
This commit is contained in:
Gerasimos Maropoulos 2016-08-16 13:17:26 +03:00
parent c6f5406c3b
commit ca2e46f1c3
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
iris.go
View File

@ -705,7 +705,11 @@ func Lookups() []Route {
// Lookup returns a registed route by its name // Lookup returns a registed route by its name
func (s *Framework) Lookup(routeName string) Route { func (s *Framework) Lookup(routeName string) Route {
return s.mux.lookup(routeName) r := s.mux.lookup(routeName)
if nil == r {
return nil
}
return r
} }
// Lookups returns all registed routes // Lookups returns all registed routes
@ -1050,7 +1054,7 @@ type (
StaticFS(string, string, int) RouteNameFunc StaticFS(string, string, int) RouteNameFunc
StaticWeb(string, string, int) RouteNameFunc StaticWeb(string, string, int) RouteNameFunc
StaticServe(string, ...string) RouteNameFunc StaticServe(string, ...string) RouteNameFunc
StaticContent(string, string, []byte) func(string) StaticContent(string, string, []byte) RouteNameFunc
Favicon(string, ...string) RouteNameFunc Favicon(string, ...string) RouteNameFunc
// templates // templates
@ -1739,7 +1743,7 @@ func StaticContent(reqPath string, contentType string, content []byte) RouteName
// StaticContent serves bytes, memory cached, on the reqPath // StaticContent serves bytes, memory cached, on the reqPath
// a good example of this is how the websocket server uses that to auto-register the /iris-ws.js // a good example of this is how the websocket server uses that to auto-register the /iris-ws.js
func (api *muxAPI) StaticContent(reqPath string, cType string, content []byte) func(string) { // func(string) because we use that on websockets func (api *muxAPI) StaticContent(reqPath string, cType string, content []byte) RouteNameFunc { // func(string) because we use that on websockets
modtime := time.Now() modtime := time.Now()
modtimeStr := modtime.UTC().Format(config.TimeFormat) modtimeStr := modtime.UTC().Format(config.TimeFormat)
h := func(ctx *Context) { h := func(ctx *Context) {

9
websocket.go
View File

@ -51,10 +51,13 @@ func RegisterWebsocketServer(station FrameworkAPI, server WebsocketServer, logge
} }
} }
} }
clientSideLookupName := "iris-websocket-client-side"
station.Get(c.Endpoint, websocketHandler) station.Get(c.Endpoint, websocketHandler)
// serve the client side on domain:port/iris-ws.js // check if client side already exists
station.StaticContent("/iris-ws.js", "application/json", websocketClientSource) if station.Lookup(clientSideLookupName) == nil {
// serve the client side on domain:port/iris-ws.js
station.StaticContent("/iris-ws.js", "application/json", websocketClientSource)(clientSideLookupName)
}
} }