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

refactored logic

Browse Source
This commit is contained in:
0xdcarns
2021-10-26 12:27:29 -04:00
parent d25cc93598
commit 8f72ecbaa0
33 changed files with 985 additions and 1092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
logic/server.go
View File

@@ -38,7 +38,7 @@ func ServerJoin(network string, serverID string, privateKey string) error {
MacAddress: serverID,
UDPHolePunch: "no",
}
node.SetDefaults()
SetNodeDefaults(node)
if servercfg.GetPlatform() == "Kubernetes" {
node.ListenPort = KUBERNETES_LISTEN_PORT
@@ -200,7 +200,7 @@ func ServerPull(mac string, network string, onErr bool) (*models.Node, error) {
return &serverNode, err
}
// handle server side update
if err = serverNode.Update(&serverNode); err != nil {
if err = UpdateNode(&serverNode, &serverNode); err != nil {
return &serverNode, err
}
} else {
@@ -227,7 +227,7 @@ func ServerPush(mac string, network string) error {
}
serverNode.OS = runtime.GOOS
serverNode.SetLastCheckIn()
return serverNode.Update(&serverNode)
return UpdateNode(&serverNode, &serverNode)
}
// ServerLeave - removes a server node