Browse Source

changed to pass by value

0xdcarns 3 years ago
parent
commit
0adaa40d2c
3 changed files with 4 additions and 6 deletions
  1. 1 1
      controllers/node.go
  2. 1 1
      controllers/node_grpc.go
  3. 2 4
      controllers/server_util.go

+ 1 - 1
controllers/node.go

@@ -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

+ 1 - 1
controllers/node_grpc.go

@@ -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())
 	}
 	}

+ 2 - 4
controllers/server_util.go

@@ -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,
-	}
-	if serverNode.IsServer == "yes" {
-		serverData.ServerNode = *serverNode
+		ServerNode:  serverNode,
 	}
 	}
 	serverctl.Push(serverData)
 	serverctl.Push(serverData)