Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Refactored web socket middleware to return errors

Browse source
This commit is contained in:
Matthew Holt 2015-03-28 16:56:33 -06:00
parent b87e6ccb76
commit 076d4e0ec5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
middleware/websockets/websockets.go
View file

@ -16,7 +16,7 @@ type (
// websocket endpoints. // websocket endpoints.
WebSockets struct { WebSockets struct {
// Next is the next HTTP handler in the chain for when the path doesn't match // Next is the next HTTP handler in the chain for when the path doesn't match
Next http.HandlerFunc Next middleware.HandlerFunc
// Sockets holds all the web socket endpoint configurations // Sockets holds all the web socket endpoint configurations
Sockets []WSConfig Sockets []WSConfig
@ -33,7 +33,7 @@ type (
) )
// ServeHTTP converts the HTTP request to a WebSocket connection and serves it up. // ServeHTTP converts the HTTP request to a WebSocket connection and serves it up.
func (ws WebSockets) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (ws WebSockets) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
for _, sockconfig := range ws.Sockets { for _, sockconfig := range ws.Sockets {
if middleware.Path(r.URL.Path).Matches(sockconfig.Path) { if middleware.Path(r.URL.Path).Matches(sockconfig.Path) {
socket := WebSocket{ socket := WebSocket{
@ -41,12 +41,12 @@ func (ws WebSockets) ServeHTTP(w http.ResponseWriter, r *http.Request) {
Request: r, Request: r,
} }
websocket.Handler(socket.Handle).ServeHTTP(w, r) websocket.Handler(socket.Handle).ServeHTTP(w, r)
return return 0, nil
} }
} }
// Didn't match a websocket path, so pass-thru // Didn't match a websocket path, so pass-thru
ws.Next(w, r) return ws.Next(w, r)
} }
// New constructs and configures a new websockets middleware instance. // New constructs and configures a new websockets middleware instance.
@ -115,7 +115,7 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
GatewayInterface = envGatewayInterface GatewayInterface = envGatewayInterface
ServerSoftware = envServerSoftware ServerSoftware = envServerSoftware
return func(next http.HandlerFunc) http.HandlerFunc { return func(next middleware.HandlerFunc) middleware.HandlerFunc {
return WebSockets{Next: next, Sockets: websocks}.ServeHTTP return WebSockets{Next: next, Sockets: websocks}.ServeHTTP
}, nil }, nil
} }