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

refactoring serverinfo logic

Browse Source
This commit is contained in:
afeiszli
2022-05-31 08:42:12 -04:00
parent 46b2cfef1c
commit e4189ad8bd
7 changed files with 100 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netclient/functions/daemon.go
View File

@@ -208,11 +208,14 @@ func NewTLSConfig(server string) *tls.Config {
// this function is primarily used to create a connection to publish to the broker
func setupMQTT(cfg *config.ClientConfig, publish bool) (mqtt.Client, error) {
opts := mqtt.NewClientOptions()
if cfg.Server.Server == "" || cfg.Server.BrokerPort == "" {
reRegisterWithServer(cfg)
if cfg.Server.Server == "" || cfg.Server.MQPort == "" {
logger.Log(0, "server info looks incomplete - broker="+cfg.Server.Server+", port="+cfg.Server.MQPort+" - pulling latest server details")
if err := SetServerInfo(cfg); err != nil {
logger.Log(0, "error pulling server info: "+err.Error())
}
}
server := cfg.Server.Server
port := cfg.Server.BrokerPort
port := cfg.Server.MQPort
opts.AddBroker("ssl://" + server + ":" + port)
opts.SetTLSConfig(NewTLSConfig(server))
opts.SetClientID(ncutils.MakeRandomString(23))
@@ -251,7 +254,7 @@ func setupMQTT(cfg *config.ClientConfig, publish bool) (mqtt.Client, error) {
} else {
err = token.Error()
}
if err := checkBroker(cfg.Server.Server, cfg.Server.BrokerPort); err != nil {
if err := checkBroker(cfg.Server.Server, cfg.Server.MQPort); err != nil {
return nil, err
}
logger.Log(0, "could not connect to broker", cfg.Server.Server, err.Error())