Merge pull request #5016 from dokku/global-scheduler-detection

Properly support the --global flag when detecting the scheduler
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2022-01-28 11:34:30 -05:00
commit 2d8c3cd247
2 files changed
+11 -4

No files matched your search

+6 -1
View File
@@ -1,11 +1,12 @@
package main package main
import ( import (
"flag"
"fmt" "fmt"
"os" "os"
"strings" "strings"
flag "github.com/spf13/pflag"
"github.com/dokku/dokku/plugins/common" "github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/scheduler" "github.com/dokku/dokku/plugins/scheduler"
) )
@@ -14,6 +15,7 @@ import (
func main() { func main() {
parts := strings.Split(os.Args[0], "/") parts := strings.Split(os.Args[0], "/")
trigger := parts[len(parts)-1] trigger := parts[len(parts)-1]
global := flag.Bool("global", false, "--global: use the global environment")
flag.Parse() flag.Parse()
var err error var err error
@@ -36,6 +38,9 @@ func main() {
err = scheduler.ReportSingleApp(appName, "", "") err = scheduler.ReportSingleApp(appName, "", "")
case "scheduler-detect": case "scheduler-detect":
appName := flag.Arg(0) appName := flag.Arg(0)
if *global {
appName = "--global"
}
err = scheduler.TriggerSchedulerDetect(appName) err = scheduler.TriggerSchedulerDetect(appName)
default: default:
err = fmt.Errorf("Invalid plugin trigger call: %s", trigger) err = fmt.Errorf("Invalid plugin trigger call: %s", trigger)
+5 -3
View File
@@ -9,9 +9,11 @@ import (
// TriggerSchedulerDetect outputs a manually selected scheduler for the app // TriggerSchedulerDetect outputs a manually selected scheduler for the app
func TriggerSchedulerDetect(appName string) error { func TriggerSchedulerDetect(appName string) error {
if scheduler := common.PropertyGet("scheduler", appName, "selected"); scheduler != "" { if appName != "--global" {
fmt.Println(scheduler) if scheduler := common.PropertyGet("scheduler", appName, "selected"); scheduler != "" {
return nil fmt.Println(scheduler)
return nil
}
} }
if scheduler := common.PropertyGet("scheduler", "--global", "selected"); scheduler != "" { if scheduler := common.PropertyGet("scheduler", "--global", "selected"); scheduler != "" {