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

remove parameters from mq peer msg

Browse source
This commit is contained in:
Abhishek Kondur 2023-01-10 10:49:15 +05:30
parent 80d9032d47
commit 9b1d8b1d89
7 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/dns.go
View file

@ -176,7 +176,7 @@ func createDNS(w http.ResponseWriter, r *http.Request) {
}
logger.Log(1, "new DNS record added:", entry.Name)
if servercfg.IsMessageQueueBackend() {
if err = mq.PublishPeerUpdate(entry.Network, false); err != nil {
if err = mq.PublishPeerUpdate(); err != nil {
logger.Log(0, "failed to publish peer update after ACL update on", entry.Network)
}
}

4
controllers/hosts.go
View file

@ -236,7 +236,7 @@ func createHostRelay(w http.ResponseWriter, r *http.Request) {
// logger.Log(1, "error sending update to relay host ", relayHost.ID.String(), ": ", err.Error())
// }
go func() {
if err := mq.PublishPeerUpdate("", false); err != nil {
if err := mq.PublishPeerUpdate(); err != nil {
logger.Log(0, "fail to publish peer update: ", err.Error())
}
}()
@ -279,7 +279,7 @@ func deleteHostRelay(w http.ResponseWriter, r *http.Request) {
// logger.Log(1, "error sending update to relayed host ", relayHost.ID.String(), ": ", err.Error())
// }
go func() {
if err := mq.PublishPeerUpdate("", false); err != nil {
if err := mq.PublishPeerUpdate(); err != nil {
logger.Log(0, "fail to publish peer update: ", err.Error())
}
}()

2
controllers/network.go
View file

@ -307,7 +307,7 @@ func updateNetworkACL(w http.ResponseWriter, r *http.Request) {
// send peer updates
if servercfg.IsMessageQueueBackend() {
if err = mq.PublishPeerUpdate(netname, false); err != nil {
if err = mq.PublishPeerUpdate(); err != nil {
logger.Log(0, "failed to publish peer update after ACL update on", netname)
}
}

4
controllers/node.go
View file

@ -662,7 +662,7 @@ func createNode(w http.ResponseWriter, r *http.Request) {
json.NewEncoder(w).Encode(response)
go func() {
if err := mq.PublishPeerUpdate(data.Node.Network, true); err != nil {
if err := mq.PublishPeerUpdate(); err != nil {
logger.Log(1, "failed a peer update after creation of node", data.Host.Name)
}
}()
@ -1078,7 +1078,7 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
return
}
go func(network string) {
if err := mq.PublishPeerUpdate(network, false); err != nil {
if err := mq.PublishPeerUpdate(); err != nil {
logger.Log(1, "error publishing peer update ", err.Error())
}
}(node.Network)

1
logic/peers.go
View file

@ -321,7 +321,6 @@ func GetProxyUpdateForHost(host *models.Host) (proxy_models.ProxyManagerPayload,
//proxyPayload.WgAddr = addr.String()
proxyPayload.PeerMap = peerConfMap
fmt.Printf("----------> PEERRR MAP: %+v\n", peerConfMap)
//proxyPayload.Network = node.Network
//proxyPayload.InterfaceName = node.Interface
//hardcode or read from host ??

4
mq/handlers.go
View file

@ -116,7 +116,7 @@ func UpdateNode(client mqtt.Client, msg mqtt.Message) {
return
}
if ifaceDelta { // reduce number of unneeded updates, by only sending on iface changes
if err = PublishPeerUpdate(currentNode.Network, true); err != nil {
if err = PublishPeerUpdate(); err != nil {
logger.Log(0, "error updating peers when node", currentNode.ID.String(), "informed the server of an interface change", err.Error())
}
}
@ -218,7 +218,7 @@ func ClientPeerUpdate(client mqtt.Client, msg mqtt.Message) {
}
func updateNodePeers(currentNode *models.Node) {
if err := PublishPeerUpdate(currentNode.Network, false); err != nil {
if err := PublishPeerUpdate(); err != nil {
logger.Log(1, "error publishing peer update ", err.Error())
return
}

4
mq/publishers.go
View file

@ -15,7 +15,7 @@ import (
)
// PublishPeerUpdate --- determines and publishes a peer update to all the hosts
func PublishPeerUpdate(network string, publishToSelf bool) error {
func PublishPeerUpdate() error {
if !servercfg.IsMessageQueueBackend() {
return nil
}
@ -74,7 +74,7 @@ func PublishSingleHostUpdate(host *models.Host) error {
// PublishPeerUpdate --- publishes a peer update to all the peers of a node
func PublishExtPeerUpdate(node *models.Node) error {
go PublishPeerUpdate(node.Network, false)
go PublishPeerUpdate()
return nil
}