3pp-mirror/neko
1
0
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2025-07-24 03:59:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

remove duplicate error logging.

Browse source
This commit is contained in:
Miroslav Šedivý 2020-11-16 18:12:25 +01:00
parent b411675108
commit 316533dab0
5 changed files with 70 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/websocket/handler/session.go
View file

@ -44,7 +44,6 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error {
Event: event.MEMBER_LIST,
Memebers: members,
}); err != nil {
h.logger.Warn().Str("id", session.ID()).Err(err).Msgf("sending event %s has failed", event.MEMBER_LIST)
return err
}
@ -60,31 +59,27 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error {
Event: event.CONTROL_LOCKED,
ID: host.ID(),
}); err != nil {
h.logger.Warn().Str("id", session.ID()).Err(err).Msgf("sending event %s has failed", event.CONTROL_LOCKED)
return err
}
}
// let everyone know there is a new session
if err := h.sessions.Broadcast(
return h.sessions.Broadcast(
message.Member{
Event: event.MEMBER_CONNECTED,
ID: session.ID(),
Name: session.Name(),
Admin: session.Admin(),
Muted: session.Muted(),
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.CONTROL_RELEASE)
return err
}
return nil
}, nil)
}
func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error {
// clear host if exists
if session.IsHost() {
h.sessions.ClearHost()
// gracefully handle error
if err := h.sessions.Broadcast(
message.Control{
Event: event.CONTROL_RELEASE,
@ -95,14 +90,9 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error {
}
// let everyone know session disconnected
if err := h.sessions.Broadcast(
return h.sessions.Broadcast(
message.MemberDisconnected{
Event: event.MEMBER_DISCONNECTED,
ID: session.ID(),
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("broadcasting event %s has failed", event.MEMBER_DISCONNECTED)
return err
}
return nil
}, nil);
}