Skip to content

Commit 5eda051

Browse files
committed
server: Fix golangci-lint
1 parent 95d80ab commit 5eda051

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

pkg/log/file_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ func TestFileLogger(t *testing.T) {
4848
}
4949
l.SetFlags(0) // don't worry about prefixes
5050
l.F("test test test")
51-
l.SetFile(n2)
51+
err = l.SetFile(n2)
52+
if err != nil {
53+
t.Fatal(err)
54+
}
5255
l.F("vvvvvvvvvv")
5356
l.Close()
5457

pkg/server/server.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,18 +103,21 @@ func (s *Server) loadConfig(c *Config) error {
103103
}
104104

105105
s.reloadLock.Lock()
106+
defer s.reloadLock.Unlock()
106107
if s.ListenAddr == "" {
107108
s.ListenAddr = c.Proxy.Listen
108109
}
109110
if s.HTTPListenAddr == "" {
110111
s.HTTPListenAddr = c.Proxy.ListenHTTP
111112
}
112-
s.accessLog.SetFile(c.Proxy.AccessLog)
113-
s.errorLog.SetFile(c.Proxy.ErrorLog)
113+
if err := s.accessLog.SetFile(c.Proxy.AccessLog); err != nil {
114+
return err
115+
}
116+
if err := s.errorLog.SetFile(c.Proxy.AccessLog); err != nil {
117+
return err
118+
}
114119
s.Motd = c.Proxy.Motd
115120
s.modules = modules
116-
s.reloadLock.Unlock()
117-
118121
return nil
119122
}
120123

0 commit comments

Comments
 (0)