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

added server pulls upon server initialize if networks present

Browse Source
This commit is contained in:
0xdcarns
2022-02-05 13:12:07 -05:00
parent 4815c4da13
commit 1a7a8beabc
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
logic/server.go
View File

@@ -141,11 +141,11 @@ func ServerJoin(networkSettings *models.Network) (models.Node, error) {
// ServerUpdate - updates the server
// replaces legacy Checkin code
func ServerUpdate(serverNode *models.Node, ifaceDelta bool) error {
var err = serverPull(serverNode, ifaceDelta)
var err = ServerPull(serverNode, ifaceDelta)
if isDeleteError(err) {
return DeleteNodeByID(serverNode, true)
} else if err != nil && !ifaceDelta {
err = serverPull(serverNode, true)
err = ServerPull(serverNode, true)
if err != nil {
return err
}
@@ -369,7 +369,11 @@ func checkNodeActions(node *models.Node) string {
// == Private ==
func serverPull(serverNode *models.Node, ifaceDelta bool) error {
// ServerPull - performs a server pull
func ServerPull(serverNode *models.Node, ifaceDelta bool) error {
if serverNode.IsServer != "yes" {
return fmt.Errorf("attempted pull from non-server node: %s - %s", serverNode.Name, serverNode.ID)
}
var err error
if serverNode.IPForwarding == "yes" {
@@ -400,7 +404,7 @@ func serverPull(serverNode *models.Node, ifaceDelta bool) error {
} else {
if err = setWGConfig(serverNode, true); err != nil {
if errors.Is(err, os.ErrNotExist) {
return serverPull(serverNode, true)
return ServerPull(serverNode, true)
} else {
return err
}