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

Remove SSDP GUID from settings

Browse Source
This commit is contained in:
Sybren A. Stüvel 2022-02-22 10:33:28 +01:00
parent f0215e20b8
commit ad6cbcbae2
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,6 @@ var defaultConfig = Conf{
// // be accurate enough for this type of cleanup. // // be accurate enough for this type of cleanup.
// TaskCleanupMaxAge: 14 * 24 * time.Hour, // TaskCleanupMaxAge: 14 * 24 * time.Hour,
SSDPDiscovery: false, // Only enable after SSDP discovery has been improved (avoid finding printers). SSDPDiscovery: false, // Only enable after SSDP discovery has been improved (avoid finding printers).
SSDPDeviceUUID: "64ad4c21-6042-4378-9cdf-478f88b4f990", // UUID specific for Flamenco v3.
BlacklistThreshold: 3, BlacklistThreshold: 3,
TaskFailAfterSoftFailCount: 3, TaskFailAfterSoftFailCount: 3,

1
internal/manager/config/settings.go
View File

@ -108,7 +108,6 @@ type Base struct {
TaskFailAfterSoftFailCount int `yaml:"task_fail_after_softfail_count"` TaskFailAfterSoftFailCount int `yaml:"task_fail_after_softfail_count"`
SSDPDiscovery bool `yaml:"ssdp_discovery"` SSDPDiscovery bool `yaml:"ssdp_discovery"`
SSDPDeviceUUID string `yaml:"ssdp_device_uuid"`
TestTasks TestTasks `yaml:"test_tasks"` TestTasks TestTasks `yaml:"test_tasks"`

4
internal/manager/config/settings_test.go
View File

@ -32,8 +32,8 @@ func TestDefaultSettings(t *testing.T) {
// The settings should contain the defaults, though. // The settings should contain the defaults, though.
assert.Equal(t, latestConfigVersion, config.Meta.Version) assert.Equal(t, latestConfigVersion, config.Meta.Version)
assert.Equal(t, "./task-logs", config.TaskLogsPath) assert.Equal(t, defaultConfig.TaskLogsPath, config.TaskLogsPath)
assert.Equal(t, "64ad4c21-6042-4378-9cdf-478f88b4f990", config.SSDPDeviceUUID) assert.Equal(t, defaultConfig.DatabaseDSN, config.DatabaseDSN)
assert.Contains(t, config.Variables, "job_storage") assert.Contains(t, config.Variables, "job_storage")
assert.Contains(t, config.Variables, "render") assert.Contains(t, config.Variables, "render")