diff options
| author | itchyonion <itchyonion@torproject.org> | 2022-11-08 13:22:51 -0800 |
|---|---|---|
| committer | itchyonion <itchyonion@torproject.org> | 2022-11-16 10:08:11 -0800 |
| commit | 9d72b30603e644b8cf0645ab8da189814c093650 (patch) | |
| tree | 079d3521a83eedef878b8af54160f82e5691239d | |
| parent | 768b80dbdfba8733a614770c93fdbea4d48c7c52 (diff) | |
| download | snowflake-9d72b30603e644b8cf0645ab8da189814c093650.tar.gz snowflake-9d72b30603e644b8cf0645ab8da189814c093650.zip | |
proxy: Let verbose level act on file logging
| -rw-r--r-- | proxy/main.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/proxy/main.go b/proxy/main.go index ea8f427..3dad5a9 100644 --- a/proxy/main.go +++ b/proxy/main.go @@ -80,12 +80,12 @@ func main() { AllowNonTLSRelay: *allowNonTLSRelay, } - var logOutput io.Writer = os.Stderr + var logOutput = ioutil.Discard var eventlogOutput io.Writer = os.Stderr log.SetFlags(log.LstdFlags | log.LUTC) - if !*verboseLogging { - logOutput = ioutil.Discard + if *verboseLogging { + logOutput = os.Stderr } if *logFilename != "" { @@ -94,9 +94,12 @@ func main() { log.Fatal(err) } defer f.Close() - logOutput = io.MultiWriter(logOutput, f) + if *verboseLogging { + logOutput = io.MultiWriter(logOutput, f) + } eventlogOutput = io.MultiWriter(eventlogOutput, f) } + if *unsafeLogging { log.SetOutput(logOutput) } else { |