Merge pull request #833 from gravitl/develop

Develop
This commit is contained in:
dcarns 2022-02-23 08:57:03 -05:00 committed by GitHub
commit 7a3cd8b51d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View file

@ -333,7 +333,7 @@ func getCommsNetworks(networks []string) (map[string]bool, error) {
func getCommsCfgByNode(node *models.Node) config.ClientConfig {
var commsCfg config.ClientConfig
commsCfg.Network = node.Network
commsCfg.Network = node.CommID
commsCfg.ReadConfig()
return commsCfg
}

View file

@ -215,7 +215,7 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string, iscomms bool) error
setListenPort(oldListenPort, &cfg)
err = config.ModConfig(&node)
err = config.ModConfig(&cfg.Node)
if err != nil {
return err
}
@ -298,7 +298,6 @@ func setListenPort(oldListenPort int32, cfg *config.ClientConfig) {
// if newListenPort has been modified to find an available port, publish to server
if cfg.Node.ListenPort != newListenPort {
var currentCommsCfg = getCommsCfgByNode(&cfg.Node)
log.Println("DELETE ME: publishing update of port: " + string(cfg.Node.ListenPort))
PublishNodeUpdate(&currentCommsCfg, cfg)
}
}