uwaru/matterbridge
1
0
Fork 0
forked from jshiffer/matterbridge
Code Pull Requests Activity

Check for expiring sessions and reconnect (mattermost)

Browse Source
This commit is contained in:
Wim 2018-10-27 22:03:41 +02:00
parent e2b50d6194
commit 32f478e4a0
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
matterclient/matterclient.go
View File

@ -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) m.log.Debugf("posting lastview %#v", channelId)
view := &model.ChannelView{ChannelId: channelId} view := &model.ChannelView{ChannelId: channelId}
_, resp := m.Client.ViewChannel(m.User.Id, view) _, resp := m.Client.ViewChannel(m.User.Id, view)
if resp.Error != nil { if resp.Error != nil {
m.log.Errorf("ChannelView update for %s failed: %s", channelId, resp.Error) m.log.Errorf("ChannelView update for %s failed: %s", channelId, resp.Error)
return resp.Error
} }
return nil
} }
func (m *MMClient) UpdateUserNick(nick string) error { func (m *MMClient) UpdateUserNick(nick string) error {
@ -896,8 +898,7 @@ func (m *MMClient) StatusLoop() {
return return
} }
if m.WsConnected { if m.WsConnected {
m.log.Debug("WS PING") m.checkAlive()
m.sendWSRequest("ping", nil)
select { select {
case <-m.WsPingChan: case <-m.WsPingChan:
m.log.Debug("WS PONG received") m.log.Debug("WS PONG received")
@ -972,6 +973,16 @@ func (m *MMClient) initUser() error {
return nil 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 { func (m *MMClient) sendWSRequest(action string, data map[string]interface{}) error {
req := &model.WebSocketRequest{} req := &model.WebSocketRequest{}
req.Seq = m.WsSequence req.Seq = m.WsSequence