luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #7704 from hashicorp/b-agent-shutdown-order

Browse source 
agent: shutdown agent http server last
This commit is contained in:
Mahmood Ali 2020-04-20 10:37:26 -04:00 committed by GitHub
parent 3e741a0caa b78680eee7
commit 5b42796f1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
command/agent/command.go
View file

@ -640,10 +640,12 @@ func (c *Command) Run(args []string) int {
logGate.Flush()
return 1
}
defer c.agent.Shutdown()
// Shutdown the HTTP server at the end
defer func() {
c.agent.Shutdown()
// Shutdown the http server at the end, to ease debugging if
// the agent takes long to shutdown
if c.httpServer != nil {
c.httpServer.Shutdown()
}