Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mqtt: update online status on reconnect (#9394)

Browse source
This commit is contained in:
andig 2023-08-16 07:51:48 +02:00 • committed by GitHub
parent f41819ff15
commit a8086a9312
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cmd/setup.go
View file

@ -161,14 +161,21 @@ func configureInflux(conf server.InfluxConfig, site site.API, in <-chan util.Par
func configureMQTT(conf mqttConfig) error {
log := util.NewLogger("mqtt")
var err error
if mqtt.Instance, err = mqtt.RegisteredClient(log, conf.Broker, conf.User, conf.Password, conf.ClientID, 1, conf.Insecure, func(options *paho.ClientOptions) {
instance, err := mqtt.RegisteredClient(log, conf.Broker, conf.User, conf.Password, conf.ClientID, 1, conf.Insecure, func(options *paho.ClientOptions) {
topic := fmt.Sprintf("%s/status", strings.Trim(conf.Topic, "/"))
options.SetWill(topic, "offline", 1, true)
}); err != nil {
oc := options.OnConnect
options.SetOnConnectHandler(func(client paho.Client) {
oc(client) // original handler
_ = mqtt.Instance.Publish(topic, true, "online") // alive
})
})
if err != nil {
return fmt.Errorf("failed configuring mqtt: %w", err)
}
mqtt.Instance = instance
return nil
}

6
server/mqtt.go
View file

@ -209,10 +209,6 @@ func (m *MQTT) listenSetters(topic string, site site.API, lp loadpoint.API) {
// Run starts the MQTT publisher for the MQTT API
func (m *MQTT) Run(site site.API, in <-chan util.Param) {
// alive
topic := fmt.Sprintf("%s/status", m.root)
m.publish(topic, true, "online")
// site setters
m.Handler.ListenSetter(m.root+"/site/prioritySoc", func(payload string) error {
val, err := parseFloat(payload)
@ -255,7 +251,7 @@ func (m *MQTT) Run(site site.API, in <-chan util.Param) {
})
// number of loadpoints
topic = fmt.Sprintf("%s/loadpoints", m.root)
topic := fmt.Sprintf("%s/loadpoints", m.root)
m.publish(topic, true, len(site.Loadpoints()))
// loadpoint setters