sascha_hemi/spaceDevices
1
0
Fork 0
mirror of https://github.com/sascha-hemi/spaceDevices.git synced 2026-03-21 03:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't send a zero update when using listUnknown

Browse Source
This commit is contained in:
Holger Cremer
2019-11-29 23:29:25 +01:00
parent acf1c71198
commit 8270fdff90
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/spaceDevices/spaceDevices.go
View File

@@ -31,7 +31,7 @@ func main() {
userDb := db.NewUserDb(config.MacDb)
masterDb := db.NewMasterDb(config.MacDb)
mqttHandler := mqtt.NewMqttHandler(config.Mqtt)
mqttHandler := mqtt.NewMqttHandler(config.Mqtt, false)
data := mqtt.NewDeviceData(config.Locations, mqttHandler, masterDb, userDb)
data.ListenAndUpdatePeopleData()

2
cmd/unkownDevices/listUnkown.go
View File

@@ -27,7 +27,7 @@ func main() {
userDb := db.NewUserDb(config.MacDb)
masterDb := db.NewMasterDb(config.MacDb)
mqttHandler := mqtt.NewMqttHandler(config.Mqtt)
mqttHandler := mqtt.NewMqttHandler(config.Mqtt, true)
data := mqtt.NewDeviceData(config.Locations, mqttHandler, masterDb, userDb)
unknownSession := data.GetOneEntry()

20
internal/mqtt/mqtt.go
View File

@@ -9,8 +9,8 @@ import (
"github.com/eclipse/paho.mqtt.golang"
"github.com/ktt-ol/spaceDevices/internal/conf"
log "github.com/sirupsen/logrus"
"github.com/ktt-ol/spaceDevices/pkg/structs"
log "github.com/sirupsen/logrus"
)
const CLIENT_ID = "spaceDevicesGo"
@@ -47,7 +47,7 @@ func EnableMqttDebugLogging() {
mqtt.DEBUG.SetOutput(stdLogWriter)
}
func NewMqttHandler(conf conf.MqttConf) *MqttHandler {
func NewMqttHandler(conf conf.MqttConf, clientOnly bool) *MqttHandler {
opts := mqtt.NewClientOptions()
opts.AddBroker(conf.Url)
@@ -66,21 +66,25 @@ func NewMqttHandler(conf conf.MqttConf) *MqttHandler {
opts.SetTLSConfig(tlsConf)
opts.SetClientID(CLIENT_ID + GenerateRandomString(4))
opts.SetAutoReconnect(true)
opts.SetKeepAlive(10 * time.Second)
opts.SetMaxReconnectInterval(5 * time.Minute)
opts.SetWill(conf.DevicesTopic, emptyPeopleAndDevices(), 0, true)
if !clientOnly {
opts.SetAutoReconnect(true)
opts.SetKeepAlive(10 * time.Second)
opts.SetMaxReconnectInterval(5 * time.Minute)
opts.SetWill(conf.DevicesTopic, emptyPeopleAndDevices(), 0, true)
}
handler := MqttHandler{newDataChan: make(chan []byte), devicesTopic: conf.DevicesTopic, sessionTopic: conf.SessionTopic}
opts.SetOnConnectHandler(handler.onConnect)
opts.SetConnectionLostHandler(handler.onConnectionLost)
if !clientOnly {
opts.SetConnectionLostHandler(handler.onConnectionLost)
}
handler.client = mqtt.NewClient(opts)
if tok := handler.client.Connect(); tok.WaitTimeout(5*time.Second) && tok.Error() != nil {
mqttLogger.WithError(tok.Error()).Fatal("Could not connect to mqtt server.")
}
if conf.WatchDogTimeoutInMinutes > 0 {
if !clientOnly && conf.WatchDogTimeoutInMinutes > 0 {
mqttLogger.Println("Enable mqtt watch dog, timeout in minutes is", conf.WatchDogTimeoutInMinutes)
handler.watchDog = NewWatchDog(time.Duration(conf.WatchDogTimeoutInMinutes) * time.Minute)
}