remove duplicate error logging.

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

View file

@ -14,22 +14,17 @@ func (h *MessageHandlerCtx) screenSet(session types.Session, payload *message.Sc
if err := h.desktop.ChangeScreenSize(payload.Width, payload.Height, payload.Rate); err != nil {
h.logger.Warn().Err(err).Msgf("unable to change screen size")
return err
return nil
}
if err := h.sessions.Broadcast(
return h.sessions.Broadcast(
message.ScreenResolution{
Event: event.SCREEN_RESOLUTION,
ID: session.ID(),
Width: payload.Width,
Height: payload.Height,
Rate: payload.Rate,
}, nil); err != nil {
h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_RESOLUTION)
return err
}
return nil
}, nil)
}
func (h *MessageHandlerCtx) screenResolution(session types.Session) error {
@ -39,17 +34,13 @@ func (h *MessageHandlerCtx) screenResolution(session types.Session) error {
return nil
}
if err := session.Send(message.ScreenResolution{
Event: event.SCREEN_RESOLUTION,
Width: size.Width,
Height: size.Height,
Rate: int(size.Rate),
}); err != nil {
h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_RESOLUTION)
return err
}
return nil
return session.Send(
message.ScreenResolution{
Event: event.SCREEN_RESOLUTION,
Width: size.Width,
Height: size.Height,
Rate: int(size.Rate),
})
}
func (h *MessageHandlerCtx) screenConfigurations(session types.Session) error {
@ -58,13 +49,9 @@ func (h *MessageHandlerCtx) screenConfigurations(session types.Session) error {
return nil
}
if err := session.Send(message.ScreenConfigurations{
Event: event.SCREEN_CONFIGURATIONS,
Configurations: h.desktop.ScreenConfigurations(),
}); err != nil {
h.logger.Warn().Err(err).Msgf("sending event %s has failed", event.SCREEN_CONFIGURATIONS)
return err
}
return nil
return session.Send(
message.ScreenConfigurations{
Event: event.SCREEN_CONFIGURATIONS,
Configurations: h.desktop.ScreenConfigurations(),
})
}