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

refactor mq connect

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-04-29 15:34:08 -04:00
parent a7d66518c4
commit d1db0ab45a
2 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
netclient/functions/mqpublish.go
View File

@@ -76,7 +76,7 @@ func Checkin(ctx context.Context, wg *sync.WaitGroup) {
}
}
if err := PingServer(&nodeCfg); err != nil {
logger.Log(0, "could not ping server for , ", nodeCfg.Network, "\n", err.Error())
logger.Log(0, "could not ping server for", nodeCfg.Network, nodeCfg.Server.Server+"\n", err.Error())
} else {
Hello(&nodeCfg)
}
@@ -128,17 +128,25 @@ func publish(nodeCfg *config.ClientConfig, dest string, msg []byte, qos byte) er
return err
}
client := setupMQTT(nodeCfg, "", true)
client := setupMQTT(nodeCfg, true)
defer client.Disconnect(250)
encrypted, err := ncutils.Chunk(msg, serverPubKey, trafficPrivKey)
if err != nil {
return err
}
if token := client.Publish(dest, qos, false, encrypted); token.Wait() && token.Error() != nil {
return token.Error()
if token := client.Publish(dest, qos, false, encrypted); !token.WaitTimeout(30*time.Second) || token.Error() != nil {
logger.Log(0, "could not connect to broker at "+nodeCfg.Server.Server+":8883")
var err error
if token.Error() == nil {
err = errors.New("connection timeout")
} else {
err = token.Error()
}
if err != nil {
return token.Error()
}
}
return nil
}