From 95ce0063eccf66de29ead20198b64b19c3494f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Wed, 28 Oct 2020 21:59:37 +0100 Subject: [PATCH] set host catch error. --- internal/websocket/admin.go | 10 ++++++++-- internal/websocket/control.go | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/internal/websocket/admin.go b/internal/websocket/admin.go index dd78a770..cc3e6f05 100644 --- a/internal/websocket/admin.go +++ b/internal/websocket/admin.go @@ -66,7 +66,10 @@ func (h *MessageHandler) adminControl(id string, session types.Session) error { host, ok := h.sessions.GetHost() - h.sessions.SetHost(id) + if err := h.sessions.SetHost(id); err != nil { + h.logger.Warn().Err(err).Msgf("SetHost failed") + return err + } if ok { if err := h.sessions.Broadcast( @@ -138,7 +141,10 @@ func (h *MessageHandler) adminGive(id string, session types.Session, payload *me } // set host - h.sessions.SetHost(payload.ID) + if err := h.sessions.SetHost(payload.ID); err != nil { + h.logger.Warn().Err(err).Msgf("SetHost failed") + return err + } // let everyone know if err := h.sessions.Broadcast( diff --git a/internal/websocket/control.go b/internal/websocket/control.go index cf771bc3..b02fe6c8 100644 --- a/internal/websocket/control.go +++ b/internal/websocket/control.go @@ -35,7 +35,10 @@ func (h *MessageHandler) controlRequest(id string, session types.Session) error // check for host if !h.sessions.HasHost() { // set host - h.sessions.SetHost(id) + if err := h.sessions.SetHost(id); err != nil { + h.logger.Warn().Err(err).Msgf("SetHost failed") + return err + } // let everyone know if err := h.sessions.Broadcast( @@ -89,7 +92,10 @@ func (h *MessageHandler) controlGive(id string, session types.Session, payload * } // set host - h.sessions.SetHost(payload.ID) + if err := h.sessions.SetHost(payload.ID); err != nil { + h.logger.Warn().Err(err).Msgf("SetHost failed") + return err + } // let everyone know if err := h.sessions.Broadcast(