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

ensure new listen port is written to config files and mq uses comms network

Browse Source
This commit is contained in:
Matthew R. Kasun
2022-02-22 22:34:08 -05:00
parent 8ab0f1a46c
commit 6c064cd4c6
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netclient/functions/daemon.go
View File

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

3
netclient/functions/join.go
View File

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