Skip to content

Commit

Permalink
Merge pull request #56 from supertypo/logging-improvements
Browse files Browse the repository at this point in the history
Logging improvements
  • Loading branch information
tiram88 authored Jul 16, 2023
2 parents 96d4f1f + bd49ce3 commit c4d73f5
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 12 deletions.
4 changes: 3 additions & 1 deletion config.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ type ConfigFlags struct {
Profile string `long:"profile" description:"Enable HTTP profiling on given port -- NOTE port must be between 1024 and 65536"`
GRPCListen string `long:"grpclisten" description:"Listen gRPC requests on address:port"`
NetSuffix uint16 `long:"netsuffix" description:"Testnet network suffix number"`
NoLogFiles bool `long:"nologfiles" description:"Disable logging to file"`
LogLevel string `long:"loglevel" description:"Loglevel for stdout (console). Default: Info"`
config.NetworkFlags
}

Expand Down Expand Up @@ -204,7 +206,7 @@ func loadConfig() (*ConfigFlags, error) {
}
}

initLog(appLogFile, appErrLogFile)
initLog(activeConfig.NoLogFiles, activeConfig.LogLevel, appLogFile, appErrLogFile)

return activeConfig, nil
}
Expand Down
2 changes: 1 addition & 1 deletion dnsseed.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func creep() {

err := pollPeer(netAdapter, addr)
if err != nil {
log.Warnf(err.Error())
log.Debugf(err.Error())
if defaultSeeder != nil && addr == defaultSeeder {
panics.Exit(log, "failed to poll default seeder")
}
Expand Down
27 changes: 17 additions & 10 deletions log.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,29 @@ var (
spawn = panics.GoroutineWrapperFunc(log)
)

func initLog(logFile, errLogFile string) {
err := backendLog.AddLogFile(logFile, logger.LevelTrace)
if err != nil {
fmt.Fprintf(os.Stderr, "Error adding log file %s as log rotator for level %s: %s", logFile, logger.LevelTrace, err)
func initLog(noLogFiles bool, logLevel, logFile, errLogFile string) {
level, ok := logger.LevelFromString(logLevel)
if !ok {
fmt.Fprintf(os.Stderr, "Invalid loglevel: %s", logLevel)
os.Exit(1)
}
err = backendLog.AddLogFile(errLogFile, logger.LevelWarn)
err := backendLog.AddLogWriter(os.Stdout, level)
if err != nil {
fmt.Fprintf(os.Stderr, "Error adding log file %s as log rotator for level %s: %s", errLogFile, logger.LevelWarn, err)
fmt.Fprintf(os.Stderr, "Error adding stdout to the logger for level %s: %s", logger.LevelWarn, err)
os.Exit(1)
}

err = backendLog.AddLogWriter(os.Stdout, logger.LevelInfo)
if err != nil {
fmt.Fprintf(os.Stderr, "Error adding stdout to the loggerfor level %s: %s", logger.LevelWarn, err)
os.Exit(1)
if !noLogFiles {
err = backendLog.AddLogFile(logFile, logger.LevelTrace)
if err != nil {
fmt.Fprintf(os.Stderr, "Error adding log file %s as log rotator for level %s: %s", logFile, logger.LevelTrace, err)
os.Exit(1)
}
err = backendLog.AddLogFile(errLogFile, logger.LevelWarn)
if err != nil {
fmt.Fprintf(os.Stderr, "Error adding log file %s as log rotator for level %s: %s", errLogFile, logger.LevelWarn, err)
os.Exit(1)
}
}

err = backendLog.Run()
Expand Down

0 comments on commit c4d73f5

Please sign in to comment.