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

changed some logs and added bool for server pull

Browse Source
This commit is contained in:
0xdcarns
2021-10-14 12:15:25 -04:00
parent 3b58aa5cec
commit 7f6a288e21
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
logic/server.go
View File

@@ -142,7 +142,7 @@ func ServerCheckin(mac string, network string) error {
return err
}
newNode, err = ServerPull(mac, network)
newNode, err = ServerPull(mac, network, false)
if isDeleteError(err) {
return ServerLeave(mac, network)
} else if err != nil {
@@ -158,7 +158,7 @@ func ServerCheckin(mac string, network string) error {
}
// ServerPull - pulls current config/peers for server
func ServerPull(mac string, network string) (*models.Node, error) {
func ServerPull(mac string, network string, onErr bool) (*models.Node, error) {
var serverNode models.Node
var err error
@@ -174,7 +174,7 @@ func ServerPull(mac string, network string) (*models.Node, error) {
}
serverNode.OS = runtime.GOOS
if serverNode.PullChanges == "yes" {
if serverNode.PullChanges == "yes" || onErr {
// check for interface change
var isIfacePresent bool
var oldIfaceName string
@@ -197,7 +197,7 @@ func ServerPull(mac string, network string) (*models.Node, error) {
} else {
if err = setWGConfig(serverNode, network, true); err != nil {
if errors.Is(err, os.ErrNotExist) {
return ServerPull(serverNode.MacAddress, serverNode.Network)
return ServerPull(serverNode.MacAddress, serverNode.Network, true)
} else {
return &serverNode, err
}