commands: Cache logFile in createLogger

This commit is contained in:
bogem 2017-02-20 13:53:11 +05:00 committed by Bjørn Erik Pedersen
parent 9e52477d94
commit 7934db9169

View file

@ -398,22 +398,21 @@ func InitializeConfig(subCmdVs ...*cobra.Command) (*deps.DepsCfg, error) {
func createLogger(cfg config.Provider) (*jww.Notepad, error) { func createLogger(cfg config.Provider) (*jww.Notepad, error) {
var ( var (
logHandle = ioutil.Discard logHandle = ioutil.Discard
logThreshold = jww.LevelWarn
logFile = cfg.GetString("logFile")
outHandle = os.Stdout outHandle = os.Stdout
stdoutThreshold = jww.LevelError stdoutThreshold = jww.LevelError
logThreshold = jww.LevelWarn
) )
if verboseLog || logging || (cfg.GetString("logFile") != "") { if verboseLog || logging || (logFile != "") {
var err error var err error
if cfg.GetString("logFile") != "" { if logFile != "" {
path := cfg.GetString("logFile") logHandle, err = os.OpenFile(logFile, os.O_RDWR|os.O_APPEND|os.O_CREATE, 0666)
logHandle, err = os.OpenFile(path, os.O_RDWR|os.O_APPEND|os.O_CREATE, 0666)
if err != nil { if err != nil {
return nil, newSystemError("Failed to open log file:", path, err) return nil, newSystemError("Failed to open log file:", logFile, err)
} }
} else { } else {
logHandle, err = ioutil.TempFile(os.TempDir(), "hugo") logHandle, err = ioutil.TempFile("", "hugo")
if err != nil { if err != nil {
return nil, newSystemError(err) return nil, newSystemError(err)
} }