mirror of
https://github.com/mainflux/mainflux.git
synced 2025-04-26 13:48:53 +08:00
824156fbf0
* Replace Nats with Nats Jestream For PubSub Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Stream Description Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Subscribe using wildcard Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add consumers description Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Remove unused queue variable Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add extra configs to stream Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Use inline error handling Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * Fix connection leak in NATS publisher The publisher struct in pkg/messaging/nats/publisher.go was modified to include a new `conn` field of type `*broker.Conn`. This change was made to fix a connection leak issue in the NATS publisher. The `NewPublisher` function was updated to assign the `conn` parameter to the new `conn` field in the publisher struct. Additionally, the `Close` method in the publisher struct was modified to close the `conn` connection. This commit fixes the connection leak issue in the NATS publisher and ensures that connections are properly closed. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * feat(messaging): Add support for durable consumers This commit adds support for durable consumers to NATS JS in the messaging package. To support this functionality, the `strings` package has been imported in the `pubsub.go` file to check the topic. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat : remove internal logic to keep subscribers Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> * feat(messaging): add function to format consumer name This commit adds a new function to the `pubsub` package in the `messaging` module. The function is called `formatConsumerName` and is used to generate a consumer name for NATS messaging. The function takes two parameters, `topic` and `id`, and returns a formatted consumer name. The consumer name is generated by concatenating the `topic` and `id` parameters, with some restrictions on the characters that can be used. This function will be useful for creating durable subscriptions in NATS messaging. Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com>
116 lines
2.3 KiB
Go
116 lines
2.3 KiB
Go
// Copyright (c) Mainflux
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package mqtt_test
|
|
|
|
import (
|
|
"fmt"
|
|
"log"
|
|
"os"
|
|
"os/signal"
|
|
"syscall"
|
|
"testing"
|
|
"time"
|
|
|
|
mqtt "github.com/eclipse/paho.mqtt.golang"
|
|
mflog "github.com/mainflux/mainflux/logger"
|
|
"github.com/mainflux/mainflux/pkg/messaging"
|
|
mqttpubsub "github.com/mainflux/mainflux/pkg/messaging/mqtt"
|
|
"github.com/ory/dockertest/v3"
|
|
)
|
|
|
|
var (
|
|
pubsub messaging.PubSub
|
|
logger mflog.Logger
|
|
address string
|
|
)
|
|
|
|
const (
|
|
username = "mainflux-mqtt"
|
|
qos = 2
|
|
port = "1883/tcp"
|
|
broker = "eclipse-mosquitto"
|
|
brokerVersion = "1.6.13"
|
|
brokerTimeout = 30 * time.Second
|
|
poolMaxWait = 120 * time.Second
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
pool, err := dockertest.NewPool("")
|
|
if err != nil {
|
|
log.Fatalf("Could not connect to docker: %s", err)
|
|
}
|
|
|
|
container, err := pool.Run(broker, brokerVersion, nil)
|
|
if err != nil {
|
|
log.Fatalf("Could not start container: %s", err)
|
|
}
|
|
|
|
handleInterrupt(m, pool, container)
|
|
|
|
address = fmt.Sprintf("%s:%s", "localhost", container.GetPort(port))
|
|
pool.MaxWait = poolMaxWait
|
|
|
|
logger, err = mflog.New(os.Stdout, mflog.Debug.String())
|
|
if err != nil {
|
|
log.Fatalf(err.Error())
|
|
}
|
|
|
|
if err := pool.Retry(func() error {
|
|
pubsub, err = mqttpubsub.NewPubSub(address, brokerTimeout, logger)
|
|
return err
|
|
}); err != nil {
|
|
log.Fatalf("Could not connect to docker: %s", err)
|
|
}
|
|
|
|
code := m.Run()
|
|
if err := pool.Purge(container); err != nil {
|
|
log.Fatalf("Could not purge container: %s", err)
|
|
}
|
|
|
|
os.Exit(code)
|
|
|
|
defer func() {
|
|
err = pubsub.Close()
|
|
if err != nil {
|
|
log.Fatalf(err.Error())
|
|
}
|
|
}()
|
|
}
|
|
|
|
func handleInterrupt(m *testing.M, pool *dockertest.Pool, container *dockertest.Resource) {
|
|
c := make(chan os.Signal, 2)
|
|
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
|
|
go func() {
|
|
<-c
|
|
if err := pool.Purge(container); err != nil {
|
|
log.Fatalf("Could not purge container: %s", err)
|
|
}
|
|
os.Exit(0)
|
|
}()
|
|
}
|
|
|
|
func newClient(address, id string, timeout time.Duration) (mqtt.Client, error) {
|
|
opts := mqtt.NewClientOptions().
|
|
SetUsername(username).
|
|
AddBroker(address).
|
|
SetClientID(id)
|
|
|
|
client := mqtt.NewClient(opts)
|
|
token := client.Connect()
|
|
if token.Error() != nil {
|
|
return nil, token.Error()
|
|
}
|
|
|
|
ok := token.WaitTimeout(timeout)
|
|
if !ok {
|
|
return nil, mqttpubsub.ErrConnect
|
|
}
|
|
|
|
if token.Error() != nil {
|
|
return nil, token.Error()
|
|
}
|
|
|
|
return client, nil
|
|
}
|