diff --git a/controllers/node.go b/controllers/node.go index 65b8f0b4..9dcf6926 100644 --- a/controllers/node.go +++ b/controllers/node.go @@ -185,7 +185,7 @@ func authorize(networkCheck bool, authNetwork string, next http.Handler) http.Ha r.Header.Set("ismasterkey", "yes") } if !isadmin && params["network"] != "" { - if functions.SliceContains(networks, params["network"]) { + if logic.StringSliceContains(networks, params["network"]) { isnetadmin = true } } diff --git a/controllers/node_grpc.go b/controllers/node_grpc.go index 64974524..b79a8cee 100644 --- a/controllers/node_grpc.go +++ b/controllers/node_grpc.go @@ -127,7 +127,7 @@ func (s *NodeServiceServer) UpdateNode(ctx context.Context, req *nodepb.Object) } err = runServerUpdateIfNeeded(shouldPeersUpdate, &models.Node{}) if err != nil { - logger.Log(1, "could not update peers on gRPC after node,", newnode.ID, "updated (gRPC)") + logger.Log(1, "could not update peers on gRPC after node,", newnode.ID, "updated (gRPC), \nerror:", err.Error()) } return &nodepb.Object{ Data: string(nodeData), diff --git a/functions/helpers.go b/functions/helpers.go index f24833e9..a8dbc610 100644 --- a/functions/helpers.go +++ b/functions/helpers.go @@ -31,20 +31,6 @@ func ParseIntClient(value string) (models.IntClient, error) { return intClient, err } -//Takes in an arbitrary field and value for field and checks to see if any other -//node has that value for the same field within the network - -// SliceContains - sees if a slice contains something -func SliceContains(slice []string, item string) bool { - set := make(map[string]struct{}, len(slice)) - for _, s := range slice { - set[s] = struct{}{} - } - - _, ok := set[item] - return ok -} - // GetPeersList - gets peers for given network func GetPeersList(networkName string) ([]models.PeersResponse, error) { diff --git a/logic/nodes.go b/logic/nodes.go index 808d3129..58d36c2c 100644 --- a/logic/nodes.go +++ b/logic/nodes.go @@ -565,6 +565,7 @@ func GetNetworkServerNodeID(network string) (string, error) { return "", err } for _, node := range nodes { + logger.Log(3, "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 {