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

added better check

Browse Source
This commit is contained in:
0xdcarns
2022-02-05 13:26:12 -05:00
parent 3ea5e1b2d1
commit c22f35f57f
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/node.go
View File

@@ -610,7 +610,7 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
func runUpdates(node *models.Node, nodeUpdate bool) error { func runUpdates(node *models.Node, nodeUpdate bool) error {
//don't publish to server node //don't publish to server node
if nodeUpdate && !isServer(node) && servercfg.IsMessageQueueBackend() { if nodeUpdate && !isServer(node) {
if err := mq.NodeUpdate(node); err != nil { if err := mq.NodeUpdate(node); err != nil {
logger.Log(1, "error publishing node update", err.Error()) logger.Log(1, "error publishing node update", err.Error())
return err return err

7
controllers/server_util.go
View File

@@ -14,10 +14,9 @@ func runServerPeerUpdate(node *models.Node, ifaceDelta bool) error {
if err != nil { if err != nil {
logger.Log(3, "error occurred on timer,", err.Error()) logger.Log(3, "error occurred on timer,", err.Error())
} }
if servercfg.IsMessageQueueBackend() {
if err := mq.PublishPeerUpdate(node); err != nil { if err := mq.PublishPeerUpdate(node); err != nil {
logger.Log(0, "failed to inform peers of new node ", err.Error()) logger.Log(0, "failed to inform peers of new node ", err.Error())
}
} }
if servercfg.IsClientMode() != "on" { if servercfg.IsClientMode() != "on" {

4
mq/mq.go
View File

@@ -99,7 +99,9 @@ var UpdateNode mqtt.MessageHandler = func(client mqtt.Client, msg mqtt.Message)
// PublishPeerUpdate --- deterines and publishes a peer update to all the peers of a node // PublishPeerUpdate --- deterines and publishes a peer update to all the peers of a node
func PublishPeerUpdate(newNode *models.Node) error { func PublishPeerUpdate(newNode *models.Node) error {
if !servercfg.IsMessageQueueBackend() {
return nil
}
networkNodes, err := logic.GetNetworkNodes(newNode.Network) networkNodes, err := logic.GetNetworkNodes(newNode.Network)
if err != nil { if err != nil {
logger.Log(1, "err getting Network Nodes", err.Error()) logger.Log(1, "err getting Network Nodes", err.Error())