这是indexloc提供的服务，不要输入任何密码
Skip to content

Properly support the --global flag when detecting the scheduler #5016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2022
Merged

Properly support the --global flag when detecting the scheduler #5016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion plugins/scheduler/src/triggers/triggers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package main

import (
"flag"
"fmt"
"os"
"strings"

flag "github.com/spf13/pflag"

"github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/scheduler"
)
Expand All @@ -14,6 +15,7 @@ import (
func main() {
parts := strings.Split(os.Args[0], "/")
trigger := parts[len(parts)-1]
global := flag.Bool("global", false, "--global: use the global environment")
flag.Parse()

var err error
Expand All @@ -36,6 +38,9 @@ func main() {
err = scheduler.ReportSingleApp(appName, "", "")
case "scheduler-detect":
appName := flag.Arg(0)
if *global {
appName = "--global"
}
err = scheduler.TriggerSchedulerDetect(appName)
default:
err = fmt.Errorf("Invalid plugin trigger call: %s", trigger)
Expand Down
8 changes: 5 additions & 3 deletions plugins/scheduler/triggers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import (

// TriggerSchedulerDetect outputs a manually selected scheduler for the app
func TriggerSchedulerDetect(appName string) error {
if scheduler := common.PropertyGet("scheduler", appName, "selected"); scheduler != "" {
fmt.Println(scheduler)
return nil
if appName != "--global" {
if scheduler := common.PropertyGet("scheduler", appName, "selected"); scheduler != "" {
fmt.Println(scheduler)
return nil
}
}

if scheduler := common.PropertyGet("scheduler", "--global", "selected"); scheduler != "" {
Expand Down