From: Matt Joiner <anacrolix@gmail.com>
Date: Sat, 4 Jan 2020 05:40:51 +0000 (+1100)
Subject: cmd/torrent: Move log setup earlier to avoid race
X-Git-Tag: v1.12.0~30
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=8323dd9a14fedde3712f0b2e6cd2b1f30ab2285c;p=btrtrc.git

cmd/torrent: Move log setup earlier to avoid race
---

diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go
index b0beba21..d1be30c8 100644
--- a/cmd/torrent/main.go
+++ b/cmd/torrent/main.go
@@ -183,6 +183,9 @@ func main() {
 func mainErr() error {
 	tagflag.Parse(&flags)
 	defer envpprof.Stop()
+	if stdoutAndStderrAreSameFile() {
+		log.Default = log.Logger{log.StreamLogger{W: progress.Bypass(), Fmt: log.LineFormatter}}
+	}
 	clientConfig := torrent.NewDefaultClientConfig()
 	clientConfig.NoDHT = !flags.Dht
 	clientConfig.Debug = flags.Debug
@@ -234,9 +237,6 @@ func mainErr() error {
 	http.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
 		client.WriteStatus(w)
 	})
-	if stdoutAndStderrAreSameFile() {
-		log.SetDefault(log.Logger{log.StreamLogger{W: progress.Bypass(), Fmt: log.LineFormatter}})
-	}
 	if flags.Progress {
 		progress.Start()
 	}