Skip to content

Commit

Permalink
Merge pull request #369 from Roasbeef/fix-log-dir
Browse files Browse the repository at this point in the history
tapcfg: ensure log rotator created after config validation
  • Loading branch information
Roasbeef committed Jun 22, 2023
2 parents 6c4bd43 + 8969bc4 commit 14ec806
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions tapcfg/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -414,17 +414,6 @@ func LoadConfig(interceptor signal.Interceptor) (*Config, btclog.Logger, error)
return nil, nil, err
}

// Initialize logging at the default logging level.
tap.SetupLoggers(cfg.LogWriter, interceptor)
err = cfg.LogWriter.InitLogRotator(
filepath.Join(cfg.LogDir, defaultLogFilename),
cfg.MaxLogFileSize, cfg.MaxLogFiles,
)
if err != nil {
_, _ = fmt.Fprintln(os.Stderr, err.Error())
return nil, nil, err
}

cfgLogger := cfg.LogWriter.GenSubLogger("CONF", nil)

// Make sure everything we just loaded makes sense.
Expand All @@ -439,6 +428,17 @@ func LoadConfig(interceptor signal.Interceptor) (*Config, btclog.Logger, error)
return nil, nil, err
}

// Initialize logging at the default logging level.
tap.SetupLoggers(cfg.LogWriter, interceptor)
err = cfg.LogWriter.InitLogRotator(
filepath.Join(cleanCfg.LogDir, defaultLogFilename),
cleanCfg.MaxLogFileSize, cfg.MaxLogFiles,
)
if err != nil {
_, _ = fmt.Fprintln(os.Stderr, err.Error())
return nil, nil, err
}

// Warn about missing config file only after all other configuration is
// done. This prevents the warning on help messages and invalid
// options. Note this should go directly before the return.
Expand Down

0 comments on commit 14ec806

Please sign in to comment.