extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-08-17 02:11:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd: no context + logging for config parsing

Browse Source
This commit is contained in:
Christian Schwarz
2017-09-22 14:02:07 +02:00
parent af2ff08940
commit e87ce3f7cf
5 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/config_parse.go
View File

@ -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