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

Fix crash on reconnects when server is down. Closes #163

Browse Source
This commit is contained in:
Wim 2017-05-08 20:44:36 +02:00
parent 8fede90b9e
commit 2e703472f1
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
matterclient/matterclient.go
View File

@ -108,13 +108,24 @@ func (m *MMClient) Login() error {
m.Client = model.NewClient(uriScheme + m.Credentials.Server) m.Client = model.NewClient(uriScheme + m.Credentials.Server)
m.Client.HttpClient.Transport = &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: m.SkipTLSVerify}} m.Client.HttpClient.Transport = &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: m.SkipTLSVerify}}
m.Client.HttpClient.Timeout = time.Second * 10 m.Client.HttpClient.Timeout = time.Second * 10
// bogus call to get the serverversion
m.Client.GetClientProperties() for {
if firstConnection && !supportedVersion(m.Client.ServerVersion) { d := b.Duration()
return fmt.Errorf("unsupported mattermost version: %s", m.Client.ServerVersion) // bogus call to get the serverversion
m.Client.GetClientProperties()
if firstConnection && !supportedVersion(m.Client.ServerVersion) {
return fmt.Errorf("unsupported mattermost version: %s", m.Client.ServerVersion)
}
m.ServerVersion = m.Client.ServerVersion
if m.ServerVersion == "" {
m.log.Debugf("Server not up yet, reconnecting in %s", d)
time.Sleep(d)
} else {
m.log.Infof("Found version %s", m.ServerVersion)
break
}
} }
m.ServerVersion = m.Client.ServerVersion b.Reset()
m.log.Infof("Found version %s", m.ServerVersion)
var myinfo *model.Result var myinfo *model.Result
var appErr *model.AppError var appErr *model.AppError