gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-11 23:54:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

resolve merge conflicts

Browse source
This commit is contained in:
Abhishek Kondur 2023-01-17 18:37:58 +05:30
commit 2ea7f077f7
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mq/dynsec_helper.go
View file

@ -186,7 +186,7 @@ func fetchHostAcls(hostID string) []Acl {
},
{
AclType: "publishClientSend",
Topic: fmt.Sprintf("host/update/%s", hostID),
Topic: fmt.Sprintf("host/serverupdate/%s", hostID),
Priority: -1,
Allow: true,
},
@ -373,7 +373,7 @@ func fetchServerAcls() []Acl {
},
{
AclType: "publishClientReceive",
Topic: "host/update/#",
Topic: "host/serverupdate/#",
Priority: -1,
Allow: true,
},

2
mq/handlers.go
View file

@ -141,7 +141,7 @@ func UpdateHost(client mqtt.Client, msg mqtt.Message) {
logger.Log(1, "error unmarshaling payload ", err.Error())
return
}
logger.Log(0, fmt.Sprintf("recieved host update: %+v\n", hostUpdate))
logger.Log(0, "recieved host update for host: ", id)
var sendPeerUpdate bool
switch hostUpdate.Action {
case models.UpdateHost:

2
mq/mq.go
View file

@ -83,7 +83,7 @@ func SetupMQTT() {
client.Disconnect(240)
logger.Log(0, "node update subscription failed")
}
if token := client.Subscribe("host/update/#", 0, mqtt.MessageHandler(UpdateHost)); token.WaitTimeout(MQ_TIMEOUT*time.Second) && token.Error() != nil {
if token := client.Subscribe("host/serverupdate/#", 0, mqtt.MessageHandler(UpdateHost)); token.WaitTimeout(MQ_TIMEOUT*time.Second) && token.Error() != nil {
client.Disconnect(240)
logger.Log(0, "host update subscription failed")
}