From d9560ec1678a2efe48f4488264aa7317e765df36 Mon Sep 17 00:00:00 2001 From: leandrofars Date: Mon, 5 Feb 2024 23:29:45 -0300 Subject: [PATCH] reaftor: mtp interface + mqtt disconnection log --- backend/services/controller/internal/mqtt/mqtt.go | 1 + backend/services/controller/internal/mtp/mtp.go | 15 ++++----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/backend/services/controller/internal/mqtt/mqtt.go b/backend/services/controller/internal/mqtt/mqtt.go index 861b908..aea322c 100644 --- a/backend/services/controller/internal/mqtt/mqtt.go +++ b/backend/services/controller/internal/mqtt/mqtt.go @@ -86,6 +86,7 @@ func (m *Mqtt) Connect() { } func (m *Mqtt) Disconnect() { + log.Println("Disconnecting from MQTT broker...") err := c.Disconnect(m.Ctx) if err != nil { log.Fatalf("failed to send Disconnect: %s", err) diff --git a/backend/services/controller/internal/mtp/mtp.go b/backend/services/controller/internal/mtp/mtp.go index 584e853..3c83104 100644 --- a/backend/services/controller/internal/mtp/mtp.go +++ b/backend/services/controller/internal/mtp/mtp.go @@ -23,7 +23,7 @@ type Broker interface { //Request(msg []byte, msgType usp_msg.Header_MsgType, pubTopic string, subTopic string) } -// Not used, since we are using a broker solution. +// Not used, since we are using a broker approach. type P2P interface { } @@ -31,14 +31,7 @@ type P2P interface { func MtpService(b Broker, done chan os.Signal, wg *sync.WaitGroup) { b.Connect() wg.Done() - go func() { - for range done { - b.Disconnect() - log.Println("Successfully disconnected to MTPs!") - - // Receives signal and then replicates it to the rest of the app. - done <- os.Interrupt - } - }() - //b.Subscribe() + <-done + log.Println("Disconnect of MTP!") + b.Disconnect() }