From 32f478e4a0783762667b4e964802b3d612d1f150 Mon Sep 17 00:00:00 2001 From: Wim Date: Sat, 27 Oct 2018 22:03:41 +0200 Subject: Check for expiring sessions and reconnect (mattermost) --- matterclient/matterclient.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'matterclient') diff --git a/matterclient/matterclient.go b/matterclient/matterclient.go index 8b3c07d1..5a173fe9 100644 --- a/matterclient/matterclient.go +++ b/matterclient/matterclient.go @@ -639,13 +639,15 @@ func (m *MMClient) UpdateChannelHeader(channelId string, header string) { } } -func (m *MMClient) UpdateLastViewed(channelId string) { +func (m *MMClient) UpdateLastViewed(channelId string) error { m.log.Debugf("posting lastview %#v", channelId) view := &model.ChannelView{ChannelId: channelId} _, resp := m.Client.ViewChannel(m.User.Id, view) if resp.Error != nil { m.log.Errorf("ChannelView update for %s failed: %s", channelId, resp.Error) + return resp.Error } + return nil } func (m *MMClient) UpdateUserNick(nick string) error { @@ -896,8 +898,7 @@ func (m *MMClient) StatusLoop() { return } if m.WsConnected { - m.log.Debug("WS PING") - m.sendWSRequest("ping", nil) + m.checkAlive() select { case <-m.WsPingChan: m.log.Debug("WS PONG received") @@ -972,6 +973,16 @@ func (m *MMClient) initUser() error { return nil } +func (m *MMClient) checkAlive() error { + // check if session still is valid + _, resp := m.Client.GetMe("") + if resp.Error != nil { + return resp.Error + } + m.log.Debug("WS PING") + return m.sendWSRequest("ping", nil) +} + func (m *MMClient) sendWSRequest(action string, data map[string]interface{}) error { req := &model.WebSocketRequest{} req.Seq = m.WsSequence -- cgit v1.2.3