test

controllers/server_util.go

@@ -17,14 +17,14 @@ func runServerPeerUpdate() error {
 		logger.Log(1, "error during pop,", err.Error())
 		return err
 	}
-	return handlePeerUpdate(&settings.ServerNode)
+	return handlePeerUpdate(&settings.Node)
 }
 
-func runServerUpdateIfNeeded(shouldPeersUpdate bool, serverNode models.Node) error {
+func runServerUpdateIfNeeded(shouldPeersUpdate bool, node models.Node) error {
 	// check if a peer/server update is needed
 	var serverData = models.ServerUpdateData{
 		UpdatePeers: shouldPeersUpdate,
-		ServerNode:  serverNode,
+		Node:        node,
 	}
 	serverctl.Push(serverData)
 
@@ -36,30 +36,30 @@ func handleServerUpdate() error {
 	if settingsErr != nil {
 		return settingsErr
 	}
-	var currentServerNodeID, err = logic.GetNetworkServerNodeID(settings.ServerNode.Network)
+	var currentServerNodeID, err = logic.GetNetworkServerNodeID(settings.Node.Network)
 	if err != nil {
 		return err
 	}
 	// ensure server client is available
-	if settings.UpdatePeers || (settings.ServerNode.ID == currentServerNodeID) {
-		err = serverctl.SyncServerNetwork(&settings.ServerNode)
+	if settings.UpdatePeers || (settings.Node.ID == currentServerNodeID) {
+		err = serverctl.SyncServerNetwork(&settings.Node)
 		if err != nil {
-			logger.Log(1, "failed to sync,", settings.ServerNode.Network, ", error:", err.Error())
+			logger.Log(1, "failed to sync,", settings.Node.Network, ", error:", err.Error())
 		}
 	}
 	// if peers should update, update peers on network
 	if settings.UpdatePeers {
-		if err = handlePeerUpdate(&settings.ServerNode); err != nil {
+		if err = handlePeerUpdate(&settings.Node); err != nil {
 			return err
 		}
-		logger.Log(1, "updated peers on network:", settings.ServerNode.Network)
+		logger.Log(1, "updated peers on network:", settings.Node.Network)
 	}
 	// if the server node had an update, run the update function
-	if settings.ServerNode.ID == currentServerNodeID {
-		if err = logic.ServerUpdate(&settings.ServerNode); err != nil {
+	if settings.Node.ID == currentServerNodeID {
+		if err = logic.ServerUpdate(&settings.Node); err != nil {
 			return err
 		}
-		logger.Log(1, "server node:", settings.ServerNode.ID, "was updated")
+		logger.Log(1, "server node:", settings.Node.ID, "was updated")
 	}
 	return nil
 }
@@ -75,6 +75,10 @@ func handlePeerUpdate(node *models.Node) error {
 	if currErr != nil {
 		return currErr
 	}
+	if err = logic.ServerUpdate(&currentServerNode); err != nil {
+		return err
+	}
+	logger.Log(1, "server node:", currentServerNode.ID, "was updated")
 	logic.SetNetworkServerPeers(&currentServerNode)
 	logger.Log(1, "finished a peer update for network,", currentServerNode.Network)
 	return nil

models/structs.go

@@ -161,5 +161,5 @@ type RelayRequest struct {
 // and if it should set peers
 type ServerUpdateData struct {
 	UpdatePeers bool `json:"updatepeers" bson:"updatepeers"`
-	ServerNode  Node `json:"servernode" bson:"servernode"`
+	Node        Node `json:"servernode" bson:"servernode"`
 }