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

logs 2

Browse Source
This commit is contained in:
0xdcarns
2021-10-27 09:27:52 -04:00
parent 67a65605a4
commit e4e8f368d6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
logic/server.go
View File

@@ -2,6 +2,7 @@ package logic
import ( import (
"errors" "errors"
"fmt"
"net" "net"
"os" "os"
"runtime" "runtime"
@@ -108,6 +109,8 @@ func ServerJoin(network string, serverID string, privateKey string) error {
node.ListenPort, err = ncutils.GetFreePort(node.ListenPort) node.ListenPort, err = ncutils.GetFreePort(node.ListenPort)
if err != nil { if err != nil {
Log("Error retrieving port: "+err.Error(), 2) Log("Error retrieving port: "+err.Error(), 2)
} else {
Log("Set client port to "+fmt.Sprintf("%d", node.ListenPort)+" for network "+node.Network, 1)
} }
// safety check. If returned node from server is local, but not currently configured as local, set to local addr // safety check. If returned node from server is local, but not currently configured as local, set to local addr

6
serverctl/serverctl.go
View File

@@ -170,7 +170,9 @@ func SyncNetworks(servernets []models.Network) error {
// AddNetwork - add a network to server in client mode // AddNetwork - add a network to server in client mode
func AddNetwork(network string) (bool, error) { func AddNetwork(network string) (bool, error) {
err := logic.ServerJoin(network, servercfg.GetNodeID(), "") var err error
logic.Log("server added to network "+network, 2) if err = logic.ServerJoin(network, servercfg.GetNodeID(), ""); err == nil {
logic.Log("server added to network "+network, 2)
}
return true, err return true, err
} }