zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 01:07:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1462 from gravitl/refactor_v0.14.7_unnecessary_code

Browse Source 
remove func NetworkNodesUpdatePullChanges
This commit is contained in:
Matthew R Kasun
2022-08-18 15:51:01 -04:00
committed by GitHub
parent 18f686b4a0 3a1dd8dc1e
commit d7384b6a81
4 changed files with 15 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
controllers/node.go
View File

@@ -736,9 +736,6 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
} }
if relayupdate { if relayupdate {
updatenodes := logic.UpdateRelay(node.Network, node.RelayAddrs, newNode.RelayAddrs) updatenodes := logic.UpdateRelay(node.Network, node.RelayAddrs, newNode.RelayAddrs)
if err = logic.NetworkNodesUpdatePullChanges(node.Network); err != nil {
logger.Log(1, "error setting relay updates:", err.Error())
}
if len(updatenodes) > 0 { if len(updatenodes) > 0 {
for _, relayedNode := range updatenodes { for _, relayedNode := range updatenodes {
runUpdates(&relayedNode, false) runUpdates(&relayedNode, false)

6
logic/gateway.go
View File

@@ -93,9 +93,6 @@ func CreateEgressGateway(gateway models.EgressGatewayRequest) (models.Node, erro
if err = database.Insert(node.ID, string(nodeData), database.NODES_TABLE_NAME); err != nil { if err = database.Insert(node.ID, string(nodeData), database.NODES_TABLE_NAME); err != nil {
return models.Node{}, err return models.Node{}, err
} }
if err = NetworkNodesUpdatePullChanges(node.Network); err != nil {
return models.Node{}, err
}
return node, nil return node, nil
} }
@@ -155,9 +152,6 @@ func DeleteEgressGateway(network, nodeid string) (models.Node, error) {
if err = database.Insert(node.ID, string(data), database.NODES_TABLE_NAME); err != nil { if err = database.Insert(node.ID, string(data), database.NODES_TABLE_NAME); err != nil {
return models.Node{}, err return models.Node{}, err
} }
if err = NetworkNodesUpdatePullChanges(network); err != nil {
return models.Node{}, err
}
return node, nil return node, nil
} }

30
logic/networks.go
View File

@@ -91,36 +91,6 @@ func CreateNetwork(network models.Network) (models.Network, error) {
return network, nil return network, nil
} }
// NetworkNodesUpdatePullChanges - tells nodes on network to pull
func NetworkNodesUpdatePullChanges(networkName string) error {
collections, err := database.FetchRecords(database.NODES_TABLE_NAME)
if err != nil {
if database.IsEmptyRecord(err) {
return nil
}
return err
}
for _, value := range collections {
var node models.Node
err := json.Unmarshal([]byte(value), &node)
if err != nil {
fmt.Println("error in node address assignment!")
return err
}
if node.Network == networkName {
data, err := json.Marshal(&node)
if err != nil {
return err
}
database.Insert(node.ID, string(data), database.NODES_TABLE_NAME)
}
}
return nil
}
// GetNetworkNonServerNodeCount - get number of network non server nodes // GetNetworkNonServerNodeCount - get number of network non server nodes
func GetNetworkNonServerNodeCount(networkName string) (int, error) { func GetNetworkNonServerNodeCount(networkName string) (int, error) {

6
logic/relay.go
View File

@@ -41,9 +41,6 @@ func CreateRelay(relay models.RelayRequest) ([]models.Node, models.Node, error)
if err != nil { if err != nil {
return returnnodes, node, err return returnnodes, node, err
} }
if err = NetworkNodesUpdatePullChanges(node.Network); err != nil {
return returnnodes, models.Node{}, err
}
return returnnodes, node, nil return returnnodes, node, nil
} }
@@ -125,8 +122,5 @@ func DeleteRelay(network, nodeid string) ([]models.Node, models.Node, error) {
if err = database.Insert(nodeid, string(data), database.NODES_TABLE_NAME); err != nil { if err = database.Insert(nodeid, string(data), database.NODES_TABLE_NAME); err != nil {
return returnnodes, models.Node{}, err return returnnodes, models.Node{}, err
} }
if err = NetworkNodesUpdatePullChanges(network); err != nil {
return returnnodes, models.Node{}, err
}
return returnnodes, node, nil return returnnodes, node, nil
} }