Browse Source

added better check

0xdcarns 3 years ago
parent
commit
c22f35f57f
3 changed files with 7 additions and 6 deletions
  1. 1 1
      controllers/node.go
  2. 3 4
      controllers/server_util.go
  3. 3 1
      mq/mq.go

+ 1 - 1
controllers/node.go

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

+ 3 - 4
controllers/server_util.go

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

+ 3 - 1
mq/mq.go

@@ -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
 func PublishPeerUpdate(newNode *models.Node) error {
-
+	if !servercfg.IsMessageQueueBackend() {
+		return nil
+	}
 	networkNodes, err := logic.GetNetworkNodes(newNode.Network)
 	if err != nil {
 		logger.Log(1, "err getting Network Nodes", err.Error())