blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: set default MQTT topic prefix to 'flamenco'

Browse Source 
Set the default MQTT topic prefix to 'flamenco'. It can still be overridden
by the config in the YAML file, but it's nice to have a sensible default
when people don't configure this.
This commit is contained in:
Sybren A. Stüvel 2024-03-08 16:44:39 +01:00
parent b476e31c0c
commit d1fbe8b9f9
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/manager/config/defaults.go
View File

@ -4,6 +4,7 @@ import (
"runtime" "runtime"
"time" "time"
"projects.blender.org/studio/flamenco/internal/manager/eventbus"
shaman_config "projects.blender.org/studio/flamenco/pkg/shaman/config" shaman_config "projects.blender.org/studio/flamenco/pkg/shaman/config"
) )
@ -39,6 +40,13 @@ var defaultConfig = Conf{
BlocklistThreshold: 3, BlocklistThreshold: 3,
TaskFailAfterSoftFailCount: 3, TaskFailAfterSoftFailCount: 3,
MQTT: MQTTConfig{
Client: eventbus.MQTTClientConfig{
ClientID: eventbus.MQTTDefaultClientID,
TopicPrefix: eventbus.MQTTDefaultTopicPrefix,
},
},
}, },
Variables: map[string]Variable{ Variables: map[string]Variable{

6
internal/manager/eventbus/mqtt_client.go
View File

@ -18,7 +18,9 @@ import (
) )
const ( const (
defaultClientID = "flamenco" MQTTDefaultTopicPrefix = "flamenco"
MQTTDefaultClientID = "flamenco"
keepAlive = 30 // seconds keepAlive = 30 // seconds
connectRetryDelay = 10 * time.Second connectRetryDelay = 10 * time.Second
@ -63,7 +65,7 @@ func NewMQTTForwarder(config MQTTClientConfig) *MQTTForwarder {
return nil return nil
} }
if config.ClientID == "" { if config.ClientID == "" {
config.ClientID = defaultClientID config.ClientID = MQTTDefaultClientID
} }
brokerURL, err := url.Parse(config.BrokerURL) brokerURL, err := url.Parse(config.BrokerURL)