ogb912/micromdm
1
0
Fork 0
mirror of https://github.com/micromdm/micromdm/ synced 2026-08-07 18:15:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved ffOptions from top level block.

Browse Source 
Moved directly into the root command struct. For clarity, since it's not
used anywhere else. Might consider something else if there are
sub-commands with shared options.

Also added `MICROMDM` as the env var prefix.
This commit is contained in:
Victor Vrantchan
2020-07-11 22:57:23 -04:00
parent ba9d2a9601
commit 085120973a
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/micromdm/micromdm.go
View File

@@ -30,12 +30,11 @@ func writePID(path string) error {
func micromdm(args []string, stdin io.Reader, stdout, stderr io.Writer) int {
var (
ctx = context.Background()
logger = log.New(log.Output(stderr))
ffOptions = []ff.Option{ff.WithConfigFileParser(ff.PlainParser), ff.WithConfigFileFlag("config")}
rootfs = flag.NewFlagSet("micromdm", flag.ContinueOnError)
pidfile = rootfs.String("pidfile", "/tmp/micromdm.pid", "Path to server pidfile")
_ = rootfs.String("config", "", "Path to config file (optional)")
ctx = context.Background()
logger = log.New(log.Output(stderr))
rootfs = flag.NewFlagSet("micromdm", flag.ContinueOnError)
pidfile = rootfs.String("pidfile", "/tmp/micromdm.pid", "Path to server pidfile")
_ = rootfs.String("config", "", "Path to config file (optional)")
)
// default output is os.Stderr.
@@ -65,7 +64,7 @@ func micromdm(args []string, stdin io.Reader, stdout, stderr io.Writer) int {
root := &ffcli.Command{
ShortUsage: "micromdm [flags] <subcommand>",
FlagSet: rootfs,
Options: ffOptions,
Options: []ff.Option{ff.WithEnvVarPrefix("MICROMDM"), ff.WithConfigFileParser(ff.PlainParser), ff.WithConfigFileFlag("config")},
Subcommands: []*ffcli.Command{helpCmd, version},
Exec: func(context.Context, []string) error {
if err := writePID(*pidfile); err != nil {