Merge pull request dokku#6466 from dokku/josegonzalez-patch-1

josegonzalez · web-flow · commit ea283676895e · 2024-01-19T06:24:46.000-05:00
Use correct key for migrating global scheduler configuration on upgrade
diff --git a/plugins/scheduler/triggers.go b/plugins/scheduler/triggers.go
@@ -36,7 +36,7 @@ func TriggerInstall() error {
 		return nil
 	}
 
-	globalScheduler := config.GetWithDefault("--scheduler", "DOKKU_SCHEDULER", "")
+	globalScheduler := config.GetWithDefault("--global", "DOKKU_SCHEDULER", "")
 	if globalScheduler != "" {
 		common.LogVerboseQuiet(fmt.Sprintf("Setting scheduler property 'selected' to %v", globalScheduler))
 		if err := common.PropertyWrite("scheduler", "--global", "selected", globalScheduler); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func TriggerInstall() error {`
`36`	`36`	`return nil`
`37`	`37`	`}`
`38`	`38`
`39`		`- globalScheduler := config.GetWithDefault("--scheduler", "DOKKU_SCHEDULER", "")`
	`39`	`+ globalScheduler := config.GetWithDefault("--global", "DOKKU_SCHEDULER", "")`
`40`	`40`	`if globalScheduler != "" {`
`41`	`41`	`common.LogVerboseQuiet(fmt.Sprintf("Setting scheduler property 'selected' to %v", globalScheduler))`
`42`	`42`	`if err := common.PropertyWrite("scheduler", "--global", "selected", globalScheduler); err != nil {`