Mirroristas/planetmint-go
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint-go.git synced 2025-11-23 22:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

* added explicit mqtt client to the monitor module

Browse Source 
Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
This commit is contained in:
Jürgen Eckel 2024-04-04 14:16:06 +02:00
parent 75f1444c81
commit d317a50ce8
No known key found for this signature in database
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
monitor/mqtt_monitor.go
View File

@ -2,6 +2,7 @@ package monitor
import (
"math/rand"
"net"
"strconv"
"strings"
"sync"
@ -14,6 +15,8 @@ import (
"github.com/syndtr/goleveldb/leveldb"
)
var MonitorMQTTClient util.MQTTClientI
type MqttMonitor struct {
db *leveldb.DB
dbMutex sync.Mutex // Mutex to synchronize write operations
@ -25,6 +28,22 @@ type MqttMonitor struct {
contextMutex sync.Mutex
}
func LazyLoadMonitorMQTTClient() {
if MonitorMQTTClient != nil {
return
}
conf := config.GetConfig()
hostPort := net.JoinHostPort(conf.MqttDomain, strconv.FormatInt(int64(conf.MqttPort), 10))
uri := "tcp://" + hostPort
opts := mqtt.NewClientOptions().AddBroker(uri)
opts.SetClientID(conf.ValidatorAddress + "-monitor")
opts.SetUsername(conf.MqttUser)
opts.SetPassword(conf.MqttPassword)
MonitorMQTTClient = mqtt.NewClient(opts)
}
func NewMqttMonitorService(db *leveldb.DB, config config.Config) *MqttMonitor {
service := &MqttMonitor{db: db, config: config, numberOfElements: 0, CleanupPeriodicityInMinutes: 10}
return service
@ -133,8 +152,8 @@ func (mms *MqttMonitor) MqttMsgHandler(_ mqtt.Client, msg mqtt.Message) {
}
func (mms *MqttMonitor) MonitorActiveParticipants() {
util.LazyLoadMQTTClient()
if token := util.MQTTClient.Connect(); token.Wait() && token.Error() != nil {
LazyLoadMonitorMQTTClient()
if token := MonitorMQTTClient.Connect(); token.Wait() && token.Error() != nil {
mms.Log("[Monitor] error connecting to mqtt: " + token.Error().Error())
panic(token.Error())
}
@ -143,7 +162,7 @@ func (mms *MqttMonitor) MonitorActiveParticipants() {
// Subscribe to a topic
subscriptionTopic := "tele/#"
if token := util.MQTTClient.Subscribe(subscriptionTopic, 0, messageHandler); token.Wait() && token.Error() != nil {
if token := MonitorMQTTClient.Subscribe(subscriptionTopic, 0, messageHandler); token.Wait() && token.Error() != nil {
mms.Log("[Monitor] error registering the mqtt subscription: " + token.Error().Error())
panic(token.Error())
}

9
monitor/mqtt_monitor_test.go
View File

@ -6,7 +6,6 @@ import (
"github.com/planetmint/planetmint-go/config"
"github.com/planetmint/planetmint-go/monitor"
"github.com/planetmint/planetmint-go/util"
"github.com/planetmint/planetmint-go/util/mocks"
"github.com/stretchr/testify/assert"
"github.com/syndtr/goleveldb/leveldb"
@ -14,7 +13,7 @@ import (
func init() {
// Use MQTT mock client
util.MQTTClient = &mocks.MockMQTTClient{}
monitor.MonitorMQTTClient = &mocks.MockMQTTClient{}
}
const (
@ -23,7 +22,7 @@ const (
)
func TestGMonitorActiveParticipants(t *testing.T) {
util.LazyLoadMQTTClient()
monitor.LazyLoadMonitorMQTTClient()
cfg := config.GetConfig()
db, err := leveldb.OpenFile("./activeActors.db", nil)
assert.NoError(t, err)
@ -46,7 +45,7 @@ func TestGMonitorActiveParticipants(t *testing.T) {
}
func TestCleanupRemoval(t *testing.T) {
util.LazyLoadMQTTClient()
monitor.LazyLoadMonitorMQTTClient()
cfg := config.GetConfig()
db, err := leveldb.OpenFile("./activeActors.db", nil)
@ -71,7 +70,7 @@ func TestCleanupRemoval(t *testing.T) {
}
func TestCleanupPrecisionTest(t *testing.T) {
util.LazyLoadMQTTClient()
monitor.LazyLoadMonitorMQTTClient()
cfg := config.GetConfig()
db, err := leveldb.OpenFile("./activeActors.db", nil)

3
util/mqtt.go
View File

@ -26,9 +26,7 @@ type MQTTClientI interface {
var (
MQTTClient MQTTClientI
mqttMachineByAddressAvailabilityMapping map[string]bool
mqttAcitveMachineMapping map[string]int64
rwMu sync.RWMutex
rwActiveMachineMu sync.RWMutex
)
const (
@ -53,7 +51,6 @@ func LazyLoadMQTTClient() {
func init() {
mqttMachineByAddressAvailabilityMapping = make(map[string]bool)
mqttAcitveMachineMapping = make(map[string]int64)
}
func SendMqttPopInitMessagesToServer(ctx sdk.Context, challenge types.Challenge) {