diff --git a/cmd/config_parse.go b/cmd/config_parse.go index 8f7ad22..fd8f5a8 100644 --- a/cmd/config_parse.go +++ b/cmd/config_parse.go @@ -3,7 +3,6 @@ package cmd import ( "io/ioutil" - "context" "fmt" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" @@ -28,9 +27,7 @@ type ConfigParsingContext struct { Global *Global } -func ParseConfig(ctx context.Context, path string) (config *Config, err error) { - - log := ctx.Value(contextKeyLog).(Logger) +func ParseConfig(path string) (config *Config, err error) { if path == "" { // Try default locations @@ -40,7 +37,7 @@ func ParseConfig(ctx context.Context, path string) (config *Config, err error) { continue } if !stat.Mode().IsRegular() { - log.Printf("warning: file at default location is not a regular file: %s", l) + err = errors.Errorf("file at default location is not a regular file: %s", l) continue } path = l diff --git a/cmd/control.go b/cmd/control.go index dfdd817..b95379c 100644 --- a/cmd/control.go +++ b/cmd/control.go @@ -41,8 +41,7 @@ func doControlPProf(cmd *cobra.Command, args []string) { os.Exit(1) } - ctx := context.WithValue(context.Background(), contextKeyLog, log) - conf, err := ParseConfig(ctx, rootArgs.configFile) + conf, err := ParseConfig(rootArgs.configFile) if err != nil { log.Printf("error parsing config: %s", err) die() diff --git a/cmd/daemon.go b/cmd/daemon.go index f28ef4b..e4d524f 100644 --- a/cmd/daemon.go +++ b/cmd/daemon.go @@ -39,15 +39,15 @@ func doDaemon(cmd *cobra.Command, args []string) { log := log.New(os.Stderr, "", log.LUTC|log.Ldate|log.Ltime) - ctx := context.Background() - ctx = context.WithValue(ctx, contextKeyLog, log) - - conf, err := ParseConfig(ctx, rootArgs.configFile) + conf, err := ParseConfig(rootArgs.configFile) if err != nil { log.Printf("error parsing config: %s", err) os.Exit(1) } + ctx := context.Background() + ctx = context.WithValue(ctx, contextKeyLog, log) + d := NewDaemon(conf) d.Loop(ctx) diff --git a/cmd/stdinserver.go b/cmd/stdinserver.go index a7e4038..58dd70c 100644 --- a/cmd/stdinserver.go +++ b/cmd/stdinserver.go @@ -4,7 +4,6 @@ import ( "fmt" "os" - "context" "github.com/ftrvxmtrx/fd" "github.com/spf13/cobra" "io" @@ -31,8 +30,7 @@ func cmdStdinServer(cmd *cobra.Command, args []string) { os.Exit(1) } - ctx := context.WithValue(context.Background(), contextKeyLog, log) - conf, err := ParseConfig(ctx, rootArgs.configFile) + conf, err := ParseConfig(rootArgs.configFile) if err != nil { log.Printf("error parsing config: %s", err) die() diff --git a/cmd/test.go b/cmd/test.go index 17ce178..e2c0a18 100644 --- a/cmd/test.go +++ b/cmd/test.go @@ -66,10 +66,8 @@ func testCmdGlobalInit(cmd *cobra.Command, args []string) { testCmdGlobal.log = log.New(os.Stdout, "", 0) - ctx := context.WithValue(context.Background(), contextKeyLog, testCmdGlobal.log) - var err error - if testCmdGlobal.conf, err = ParseConfig(ctx, rootArgs.configFile); err != nil { + if testCmdGlobal.conf, err = ParseConfig(rootArgs.configFile); err != nil { testCmdGlobal.log.Printf("error parsing config file: %s", err) os.Exit(1) }