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

merge develop

Browse source
This commit is contained in:
0xdcarns 2023-02-27 19:13:48 -05:00
commit a0519cc16a
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
main.go
View file

@ -151,9 +151,14 @@ func startControllers(wg *sync.WaitGroup, ctx context.Context) {
// Should we be using a context vice a waitgroup???????????? // Should we be using a context vice a waitgroup????????????
func runMessageQueue(wg *sync.WaitGroup, ctx context.Context) { func runMessageQueue(wg *sync.WaitGroup, ctx context.Context) {
defer wg.Done() defer wg.Done()
brokerHost, secure := servercfg.GetMessageQueueEndpoint() brokerHost, _ := servercfg.GetMessageQueueEndpoint()
logger.Log(0, "connecting to mq broker at", brokerHost, "with TLS?", fmt.Sprintf("%v", secure)) logger.Log(0, "connecting to mq broker at", brokerHost)
mq.SetupMQTT() mq.SetupMQTT()
if mq.IsConnected() {
logger.Log(0, "connected to MQ Broker")
} else {
logger.FatalLog("error connecting to MQ Broker")
}
defer mq.CloseClient() defer mq.CloseClient()
go mq.Keepalive(ctx) go mq.Keepalive(ctx)
go func() { go func() {

2
mq/publishers.go
View file

@ -402,7 +402,7 @@ func getCustomDNS(network string) []models.DNSUpdate {
func sendPeers() { func sendPeers() {
hosts, err := logic.GetAllHosts() hosts, err := logic.GetAllHosts()
if err != nil { if err != nil && len(hosts) > 0 {
logger.Log(1, "error retrieving networks for keepalive", err.Error()) logger.Log(1, "error retrieving networks for keepalive", err.Error())
} }