From 1058440cfe543f810c24a8bd5a660427972d1345 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Thu, 16 Apr 2020 17:08:24 -0500
Subject: [PATCH] Do not reuse error object (data race)

---
 server/server.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/server.go b/server/server.go
index 4f55b118f..dd4d9694b 100644
--- a/server/server.go
+++ b/server/server.go
@@ -416,8 +416,9 @@ func (m *Command) setupNetworking() error {
 }
 
 // setupLogger sets up the logger based on the configuration.
-func (m *Command) setupLogger() (err error) {
+func (m *Command) setupLogger() error {
 	var f *reopen.FileWriter
+	var err error
 	if m.Config.LogPath == "" {
 		m.logOutput = m.Stderr
 	} else {
@@ -438,7 +439,7 @@ func (m *Command) setupLogger() (err error) {
 		go func() {
 			for {
 				// duplicate stderr onto log file
-				err = m.dup(int(f.Fd()), int(os.Stderr.Fd()))
+				err := m.dup(int(f.Fd()), int(os.Stderr.Fd()))
 				if err != nil {
 					m.logger.Printf("syscall dup: %s\n", err.Error())
 				}