mirror of
https://github.com/gravitl/netmaker.git
synced 2025-02-27 01:23:00 +08:00
changed to pass by value
This commit is contained in:
parent
c239465d42
commit
0adaa40d2c
3 changed files with 4 additions and 6 deletions
|
@ -565,7 +565,7 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
|
||||||
err = logic.SetDNS()
|
err = logic.SetDNS()
|
||||||
}
|
}
|
||||||
|
|
||||||
err = runServerUpdateIfNeeded(shouldPeersUpdate, &newNode)
|
err = runServerUpdateIfNeeded(shouldPeersUpdate, newNode)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
returnErrorResponse(w, r, formatError(err, "internal"))
|
returnErrorResponse(w, r, formatError(err, "internal"))
|
||||||
return
|
return
|
||||||
|
|
|
@ -125,7 +125,7 @@ func (s *NodeServiceServer) UpdateNode(ctx context.Context, req *nodepb.Object)
|
||||||
if errN != nil {
|
if errN != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
err = runServerUpdateIfNeeded(shouldPeersUpdate, &models.Node{})
|
err = runServerUpdateIfNeeded(shouldPeersUpdate, newnode)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Log(1, "could not update peers on gRPC after node,", newnode.ID, "updated (gRPC), \nerror:", err.Error())
|
logger.Log(1, "could not update peers on gRPC after node,", newnode.ID, "updated (gRPC), \nerror:", err.Error())
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,13 +20,11 @@ func runServerPeerUpdate() error {
|
||||||
return handlePeerUpdate(&settings.ServerNode)
|
return handlePeerUpdate(&settings.ServerNode)
|
||||||
}
|
}
|
||||||
|
|
||||||
func runServerUpdateIfNeeded(shouldPeersUpdate bool, serverNode *models.Node) error {
|
func runServerUpdateIfNeeded(shouldPeersUpdate bool, serverNode models.Node) error {
|
||||||
// check if a peer/server update is needed
|
// check if a peer/server update is needed
|
||||||
var serverData = models.ServerUpdateData{
|
var serverData = models.ServerUpdateData{
|
||||||
UpdatePeers: shouldPeersUpdate,
|
UpdatePeers: shouldPeersUpdate,
|
||||||
}
|
ServerNode: serverNode,
|
||||||
if serverNode.IsServer == "yes" {
|
|
||||||
serverData.ServerNode = *serverNode
|
|
||||||
}
|
}
|
||||||
serverctl.Push(serverData)
|
serverctl.Push(serverData)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue