From 8f1bf8dcc766f2f21361635a89aa04e3695665dd Mon Sep 17 00:00:00 2001 From: Gerasimos Maropoulos Date: Wed, 17 Aug 2016 23:35:46 +0300 Subject: [PATCH] Websocket: Fix silly panic when no needed https://github.com/kataras/iris/issues/367 --- websocket.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/websocket.go b/websocket.go index 2e170433..a6590321 100644 --- a/websocket.go +++ b/websocket.go @@ -36,7 +36,10 @@ func RegisterWebsocketServer(station FrameworkAPI, server WebsocketServer, logge websocketHandler := func(ctx *Context) { if err := server.Upgrade(ctx); err != nil { - logger.Panic(err) + if ctx.framework.Config.IsDevelopment { + logger.Printf("Websocket error while trying to Upgrade the connection. Trace: %s", err.Error()) + } + ctx.EmitError(StatusBadRequest) } } @@ -47,7 +50,10 @@ func RegisterWebsocketServer(station FrameworkAPI, server WebsocketServer, logge } if err := server.Upgrade(ctx); err != nil { - logger.Panic(err) + if ctx.framework.Config.IsDevelopment { + logger.Printf("Websocket error while trying to Upgrade the connection. Trace: %s", err.Error()) + } + ctx.EmitError(StatusBadRequest) } } }