zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 08:47:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor client mq connection logic2

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-07-08 10:22:23 -04:00
parent bda6f4e2c6
commit b6df54482b
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
netclient/functions/daemon.go
View File

@@ -248,27 +248,28 @@ func setupMQTT(cfg *config.ClientConfig, publish bool) (mqtt.Client, error) {
logger.Log(0, "detected broker connection lost for", cfg.Server.Server)
})
client := mqtt.NewClient(opts)
var connecterr error
for count := 0; count < 3; count++ {
connecterr = nil
if token := client.Connect(); !token.WaitTimeout(30*time.Second) || token.Error() != nil {
logger.Log(0, "unable to connect to broker, retrying ...")
var err error = nil
if token.Error() == nil {
err = errors.New("connect timeout")
connecterr = errors.New("connect timeout")
} else {
err = token.Error()
connecterr = token.Error()
}
if err != nil {
err = checkBroker(cfg.Server.Server, cfg.Server.MQPort)
if connecterr != nil {
connecterr = checkBroker(cfg.Server.Server, cfg.Server.MQPort)
}
logger.Log(0, "could not connect to broker", cfg.Server.Server, err.Error())
logger.Log(0, "could not connect to broker", cfg.Server.Server)
}
}
if err != nil {
if connecterr != nil {
reRegisterWithServer(cfg)
}
//try after re-registering
if token := client.Connect(); !token.WaitTimeout(30*time.Second) || token.Error() != nil {
return client, errors.New("unable to connect to broker")
//try after re-registering
if token := client.Connect(); !token.WaitTimeout(30*time.Second) || token.Error() != nil {
return client, errors.New("unable to connect to broker")
}
}
return client, nil