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

Avoid panic during stop

Browse source
This commit is contained in:
NicoMen 2018-09-17 16:26:03 +02:00 committed by Traefiker Bot
parent a80cca95a2
commit f3aefe282c
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/server.go
View file

@ -137,6 +137,7 @@ type serverEntryPoint struct {
func (s serverEntryPoint) Shutdown(ctx context.Context) { func (s serverEntryPoint) Shutdown(ctx context.Context) {
var wg sync.WaitGroup var wg sync.WaitGroup
if s.httpServer != nil {
wg.Add(1) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()
@ -150,6 +151,9 @@ func (s serverEntryPoint) Shutdown(ctx context.Context) {
} }
} }
}() }()
}
if s.hijackConnectionTracker != nil {
wg.Add(1) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()
@ -160,6 +164,8 @@ func (s serverEntryPoint) Shutdown(ctx context.Context) {
} }
} }
}() }()
}
wg.Wait() wg.Wait()
} }