Procházet zdrojové kódy

added inform port change util func

0xdcarns před 3 roky
rodič
revize
fd03bc2b1d

+ 0 - 8
netclient/functions/join.go

@@ -9,7 +9,6 @@ import (
 	"log"
 	"net/http"
 	"runtime"
-	"strconv"
 
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
@@ -172,18 +171,11 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
 	}
 	logger.Log(1, "node created on remote server...updating configs")
 	err = ncutils.ModPort(&node)
-<<<<<<< HEAD
 	if err != nil {
 		return err
 	}
 	informPortChange(&node)
 
-=======
-	logger.Log(0, "using port", strconv.Itoa(int(node.ListenPort)))
-	if err != nil {
-		return err
-	}
->>>>>>> b1b376b0 (moving port check logic)
 	err = config.ModNodeConfig(&node)
 	if err != nil {
 		return err

+ 1 - 0
netclient/functions/mqhandlers.go

@@ -128,6 +128,7 @@ func NodeUpdate(client mqtt.Client, msg mqtt.Message) {
 			logger.Log(0, "error modifying node port on", newNode.Name, "-", err.Error())
 			return
 		}
+		informPortChange(&newNode)
 		if err := wireguard.UpdateWgInterface(file, privateKey, nameserver, newNode); err != nil {
 			logger.Log(0, "error updating wireguard config "+err.Error())
 			return