cmd/torrent: Move log setup earlier to avoid race

diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go
index b0beba21fec664ae536780bccb2d0dd55bf7b452..d1be30c85e217069a50c4210a7024a2e60367f46 100644 (file)
--- 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()
        }