From 5c1300997cd1fa10a9b3b88a853ad82409258eaf Mon Sep 17 00:00:00 2001 From: 0xdcarns Date: Tue, 18 Jan 2022 11:32:21 -0500 Subject: [PATCH] rough draft --- controllers/node_grpc.go | 1 + controllers/server_util.go | 63 -------------------------------------- logic/nodes.go | 2 -- 3 files changed, 1 insertion(+), 65 deletions(-) diff --git a/controllers/node_grpc.go b/controllers/node_grpc.go index 58e4affa..d6245c04 100644 --- a/controllers/node_grpc.go +++ b/controllers/node_grpc.go @@ -90,6 +90,7 @@ func (s *NodeServiceServer) CreateNode(ctx context.Context, req *nodepb.Object) if err != nil { logger.Log(1, "internal error when setting peers after node,", node.ID, "was created (gRPC)") } + logger.Log(0, "new node,", node.Name, ", added on network,"+node.Network) return response, nil } diff --git a/controllers/server_util.go b/controllers/server_util.go index f2bfc3e8..83cab46a 100644 --- a/controllers/server_util.go +++ b/controllers/server_util.go @@ -21,66 +21,3 @@ func runServerPeerUpdate(network string, shouldPeerUpdate bool) error { } return nil } - -// func runServerUpdateIfNeeded(shouldPeersUpdate bool, node models.Node) error { -// // check if a peer/server update is needed -// var serverData = models.ServerUpdateData{ -// UpdatePeers: shouldPeersUpdate, -// Node: node, -// } -// serverctl.Push(serverData) - -// return handleServerUpdate() -// } - -// func handleServerUpdate() error { -// var settings, settingsErr = serverctl.Pop() -// if settingsErr != nil { -// return settingsErr -// } -// var currentServerNodeID, err = logic.GetNetworkServerNodeID(settings.Node.Network) -// if err != nil { -// return err -// } -// // ensure server client is available -// if settings.UpdatePeers || (settings.Node.ID == currentServerNodeID) { -// err = serverctl.SyncServerNetwork(&settings.Node) -// if err != nil { -// 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.Node); err != nil { -// return err -// } -// logger.Log(1, "updated peers on network:", settings.Node.Network) -// } -// // if the server node had an update, run the update function -// if settings.Node.ID == currentServerNodeID { -// if err = logic.ServerUpdate(&settings.Node); err != nil { -// return err -// } -// logger.Log(1, "server node:", settings.Node.ID, "was updated") -// } -// return nil -// } - -// // tells server to update it's peers -// func handlePeerUpdate(node *models.Node) error { -// logger.Log(1, "updating peers on network:", node.Network) -// var currentServerNodeID, err = logic.GetNetworkServerNodeID(node.Network) -// if err != nil { -// return err -// } -// var currentServerNode, currErr = logic.GetNodeByID(currentServerNodeID) -// if currErr != nil { -// return currErr -// } -// if err = logic.ServerUpdate(¤tServerNode); err != nil { -// logger.Log(1, "server node:", currentServerNode.ID, "failed update") -// return err -// } -// logger.Log(1, "finished a peer update for network,", currentServerNode.Network) -// return nil -// } diff --git a/logic/nodes.go b/logic/nodes.go index 4e9120eb..d221566e 100644 --- a/logic/nodes.go +++ b/logic/nodes.go @@ -554,9 +554,7 @@ func GetNetworkServerNodeID(network string) (string, error) { if err != nil { return "", err } - logger.Log(1, "fetching server node ID on network:", network, ", found", fmt.Sprintf("%d", len(nodes)), "nodes") for _, node := range nodes { - logger.Log(2, "looking for server node, current node:", node.Name, ",", node.ID, ",", servercfg.GetNodeID(), ",", node.MacAddress) if node.IsServer == "yes" { if servercfg.GetNodeID() != "" { if servercfg.GetNodeID() == node.MacAddress {