Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

"stopping server" logs not always visible #663

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,6 @@ func (self *Server) Stop() {
log.Info("Stopping server")
self.stopped = true

log.Info("Stopping api server")
self.HttpApi.Close()
log.Info("Api server stopped")

if self.Config.GraphiteEnabled {
log.Info("Stopping GraphiteServer")
self.GraphiteApi.Close()
Expand All @@ -292,4 +288,11 @@ func (self *Server) Stop() {
log.Info("Stopping shard store")
self.shardStore.Close()
log.Info("shard store stopped")

// HttpApi should be the last server to be closed, otherwise
// server.ListenAndServe() will return causing main() to exit before
// the other services are properly stopped
log.Info("Stopping api server")
self.HttpApi.Close()
log.Info("Api server stopped")
}