From 51aa55578de0729ce164491b7442ce32d89a0230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20Th=C3=B8ring?= Date: Wed, 12 Jul 2023 00:36:16 +0200 Subject: [PATCH] Support disabling of file logging (--nologfiles) --- config.go | 3 ++- log.go | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/config.go b/config.go index 80eccb58..e0c56cbd 100644 --- a/config.go +++ b/config.go @@ -55,6 +55,7 @@ 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"` config.NetworkFlags } @@ -204,7 +205,7 @@ func loadConfig() (*ConfigFlags, error) { } } - initLog(appLogFile, appErrLogFile) + initLog(activeConfig.NoLogFiles, appLogFile, appErrLogFile) return activeConfig, nil } diff --git a/log.go b/log.go index 702a2737..23fa64da 100644 --- a/log.go +++ b/log.go @@ -14,22 +14,24 @@ var ( spawn = panics.GoroutineWrapperFunc(log) ) -func initLog(logFile, errLogFile string) { - err := backendLog.AddLogFile(logFile, logger.LevelTrace) +func initLog(noLogFiles bool, logFile, errLogFile string) { + err := backendLog.AddLogWriter(os.Stdout, logger.LevelInfo) 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) + fmt.Fprintf(os.Stderr, "Error adding stdout to the loggerfor 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()