diff --git a/internal/manager/config/defaults.go b/internal/manager/config/defaults.go index 00bff386..6bd9bb7b 100644 --- a/internal/manager/config/defaults.go +++ b/internal/manager/config/defaults.go @@ -48,8 +48,7 @@ var defaultConfig = Conf{ // // Days are assumed to be 24 hours long. This is not exactly accurate, but should // // be accurate enough for this type of cleanup. // TaskCleanupMaxAge: 14 * 24 * time.Hour, - SSDPDiscovery: false, // Only enable after SSDP discovery has been improved (avoid finding printers). - SSDPDeviceUUID: "64ad4c21-6042-4378-9cdf-478f88b4f990", // UUID specific for Flamenco v3. + SSDPDiscovery: false, // Only enable after SSDP discovery has been improved (avoid finding printers). BlacklistThreshold: 3, TaskFailAfterSoftFailCount: 3, diff --git a/internal/manager/config/settings.go b/internal/manager/config/settings.go index 7efd085b..29fef3c5 100644 --- a/internal/manager/config/settings.go +++ b/internal/manager/config/settings.go @@ -107,8 +107,7 @@ type Base struct { // (even when there are workers left that could technically retry the task). TaskFailAfterSoftFailCount int `yaml:"task_fail_after_softfail_count"` - SSDPDiscovery bool `yaml:"ssdp_discovery"` - SSDPDeviceUUID string `yaml:"ssdp_device_uuid"` + SSDPDiscovery bool `yaml:"ssdp_discovery"` TestTasks TestTasks `yaml:"test_tasks"` diff --git a/internal/manager/config/settings_test.go b/internal/manager/config/settings_test.go index cb185acb..2ed67ee1 100644 --- a/internal/manager/config/settings_test.go +++ b/internal/manager/config/settings_test.go @@ -32,8 +32,8 @@ func TestDefaultSettings(t *testing.T) { // The settings should contain the defaults, though. assert.Equal(t, latestConfigVersion, config.Meta.Version) - assert.Equal(t, "./task-logs", config.TaskLogsPath) - assert.Equal(t, "64ad4c21-6042-4378-9cdf-478f88b4f990", config.SSDPDeviceUUID) + assert.Equal(t, defaultConfig.TaskLogsPath, config.TaskLogsPath) + assert.Equal(t, defaultConfig.DatabaseDSN, config.DatabaseDSN) assert.Contains(t, config.Variables, "job_storage") assert.Contains(t, config.Variables, "render")