baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Avoid goroutine leak in server

Browse source
This commit is contained in:
NicoMen 2018-09-06 14:24:03 +02:00 committed by Traefiker Bot
parent e4bb506ace
commit 74ace58ae1
4 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/server.go
View file

@ -248,7 +248,9 @@ func (s *Server) Start() {
s.listenConfigurations(stop) s.listenConfigurations(stop)
}) })
s.startProvider() s.startProvider()
go s.listenSignals() s.routinesPool.Go(func(stop chan bool) {
s.listenSignals(stop)
})
} }
// StartWithContext starts the server and Stop/Close it when context is Done // StartWithContext starts the server and Stop/Close it when context is Done

6
server/server_configuration.go
View file

@ -447,8 +447,10 @@ func (s *Server) throttleProviderConfigReload(throttle time.Duration, publish ch
case <-stop: case <-stop:
return return
case nextConfig := <-ring.Out(): case nextConfig := <-ring.Out():
publish <- nextConfig.(types.ConfigMessage) if config, ok := nextConfig.(types.ConfigMessage); ok {
time.Sleep(throttle) publish <- config
time.Sleep(throttle)
}
} }
} }
}) })

26
server/server_signals.go
View file

@ -13,21 +13,25 @@ func (s *Server) configureSignals() {
signal.Notify(s.signals, syscall.SIGUSR1) signal.Notify(s.signals, syscall.SIGUSR1)
} }
func (s *Server) listenSignals() { func (s *Server) listenSignals(stop chan bool) {
for { for {
sig := <-s.signals select {
switch sig { case <-stop:
case syscall.SIGUSR1: return
log.Infof("Closing and re-opening log files for rotation: %+v", sig) case sig := <-s.signals:
switch sig {
case syscall.SIGUSR1:
log.Infof("Closing and re-opening log files for rotation: %+v", sig)
if s.accessLoggerMiddleware != nil { if s.accessLoggerMiddleware != nil {
if err := s.accessLoggerMiddleware.Rotate(); err != nil { if err := s.accessLoggerMiddleware.Rotate(); err != nil {
log.Errorf("Error rotating access log: %v", err) log.Errorf("Error rotating access log: %v", err)
}
} }
}
if err := log.RotateFile(); err != nil { if err := log.RotateFile(); err != nil {
log.Errorf("Error rotating traefik log: %v", err) log.Errorf("Error rotating traefik log: %v", err)
}
} }
} }
} }

2
server/server_signals_windows.go
View file

@ -4,4 +4,4 @@ package server
func (s *Server) configureSignals() {} func (s *Server) configureSignals() {}
func (s *Server) listenSignals() {} func (s *Server) listenSignals(stop chan bool) {}