phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-01 01:29:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

commands, helpers, vendor: Update to the latest jww logger

Browse source 
Updates #2701
This commit is contained in:
Bjørn Erik Pedersen 2017-01-03 16:57:43 +01:00
parent 2ac9817eae
commit c344b1901f
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
commands/hugo.go
View file

@ -17,6 +17,7 @@ package commands
import ( import (
"fmt" "fmt"
"io/ioutil"
"net/http" "net/http"
"os" "os"
"path/filepath" "path/filepath"
@ -332,16 +333,27 @@ func InitializeConfig(subCmdVs ...*cobra.Command) error {
viper.Set("cacheDir", helpers.GetTempDir("hugo_cache", hugofs.Source())) viper.Set("cacheDir", helpers.GetTempDir("hugo_cache", hugofs.Source()))
} }
logFile := ioutil.Discard
if verboseLog || logging || (viper.IsSet("logFile") && viper.GetString("logFile") != "") { if verboseLog || logging || (viper.IsSet("logFile") && viper.GetString("logFile") != "") {
var err error
if viper.IsSet("logFile") && viper.GetString("logFile") != "" { if viper.IsSet("logFile") && viper.GetString("logFile") != "" {
jww.SetLogFile(viper.GetString("logFile")) path := viper.GetString("logFile")
logFile, err = os.OpenFile(path, os.O_RDWR|os.O_APPEND|os.O_CREATE, 0666)
if err != nil {
return newSystemError("Failed to open log file:", path, err)
}
} else { } else {
jww.UseTempLogFile("hugo") logFile, err = ioutil.TempFile(os.TempDir(), "hugo")
if err != nil {
return newSystemError(err)
}
} }
} else {
jww.DiscardLogging()
} }
jww.SetLogOutput(logFile)
if quiet { if quiet {
jww.SetStdoutThreshold(jww.LevelError) jww.SetStdoutThreshold(jww.LevelError)
} else if viper.GetBool("verbose") { } else if viper.GetBool("verbose") {

2
helpers/general.go
View file

@ -252,7 +252,7 @@ func NewDistinctErrorLogger() *DistinctLogger {
// NewDistinctFeedbackLogger creates a new DistinctLogger that can be used // NewDistinctFeedbackLogger creates a new DistinctLogger that can be used
// to give feedback to the user while not spamming with duplicates. // to give feedback to the user while not spamming with duplicates.
func NewDistinctFeedbackLogger() *DistinctLogger { func NewDistinctFeedbackLogger() *DistinctLogger {
return &DistinctLogger{m: make(map[string]bool), logger: &jww.FEEDBACK} return &DistinctLogger{m: make(map[string]bool), logger: jww.FEEDBACK}
} }
var ( var (

6
vendor/vendor.json vendored
View file

@ -281,10 +281,10 @@
"revisionTime": "2016-11-30T04:45:28Z" "revisionTime": "2016-11-30T04:45:28Z"
}, },
{ {
"checksumSHA1": "dkruahfhuLXXuyeCuRpsWlcRK+8=", "checksumSHA1": "7NGKyJZL8VItCxYkEJxNh8l9O18=",
"path": "github.com/spf13/jwalterweatherman", "path": "github.com/spf13/jwalterweatherman",
"revision": "33c24e77fb80341fe7130ee7c594256ff08ccc46", "revision": "14fe3f27973f14e5d1bb8bb16f6153cc67b30652",
"revisionTime": "2016-03-01T12:00:06Z" "revisionTime": "2017-01-03T11:13:15Z"
}, },
{ {
"checksumSHA1": "zLJY+lsX1e5OO6gRxQd5RfKgdQY=", "checksumSHA1": "zLJY+lsX1e5OO6gRxQd5RfKgdQY=",