curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-3765: Fix doubly nested log output by `logfile` option

This commit is contained in:
Nuno Diegues 2021-01-15 17:24:20 +00:00
parent 146c2d944a
commit 8da61274b8
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
logger/create.go
View File

@ -45,7 +45,7 @@ func newZerolog(loggerConfig *Config) *zerolog.Logger {
} }
if loggerConfig.FileConfig != nil { if loggerConfig.FileConfig != nil {
fileLogger, err := createFileLogger(*loggerConfig.FileConfig) fileLogger, err := createFileWriter(*loggerConfig.FileConfig)
if err != nil { if err != nil {
return fallbackLogger(err) return fallbackLogger(err)
} }
@ -128,7 +128,7 @@ func createConsoleLogger(config ConsoleConfig) io.Writer {
} }
} }
func createFileLogger(config FileConfig) (io.Writer, error) { func createFileWriter(config FileConfig) (io.Writer, error) {
var logFile io.Writer var logFile io.Writer
fullpath := config.Fullpath() fullpath := config.Fullpath()
@ -137,19 +137,17 @@ func createFileLogger(config FileConfig) (io.Writer, error) {
if err != nil { if err != nil {
// If the existing file wasn't found, or couldn't be opened, just ignore // If the existing file wasn't found, or couldn't be opened, just ignore
// it and recreate a new one. // it and recreate a new one.
logFile, err = createLogFile(config) logFile, err = createDirFile(config)
// If creating a new logfile fails, then we have no choice but to error out. // If creating a new logfile fails, then we have no choice but to error out.
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
fileLogger := zerolog.New(logFile).With().Logger() return logFile, nil
return fileLogger, nil
} }
func createLogFile(config FileConfig) (io.Writer, error) { func createDirFile(config FileConfig) (io.Writer, error) {
if config.Dirname != "" { if config.Dirname != "" {
err := os.MkdirAll(config.Dirname, dirPermMode) err := os.MkdirAll(config.Dirname, dirPermMode)