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.

Sign up for GitHub

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

Jump to bottom

Fixes to the graceful shutdown example #2552

Merged
merged 4 commits into from Jan 13, 2021
Merged

Fixes to the graceful shutdown example #2552

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b282d36
Change error comparison to use errors.Is() and add a line of whitespa…
Nov 11, 2020
b4851c4
Change from log.Fatalf to log.Printf to ensure the graceful shutdown …
Nov 11, 2020
bd5c122
Merge branch 'master' into master
thinkerou Jan 11, 2021
b312eb2
Merge branch 'master' into master
thinkerou Jan 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Expand Up @@ -1793,8 +1793,8 @@ func main() {
// Initializing the server in a goroutine so that
// it won't block the graceful shutdown handling below
go func() {
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
log.Fatalf("listen: %s\n", err)
if err := srv.ListenAndServe(); err != nil && errors.Is(err, http.ErrServerClosed) {
log.Printf("listen: %s\n", err)
}
}()

Expand All @@ -1812,6 +1812,7 @@ func main() {
// the request it is currently handling
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()

if err := srv.Shutdown(ctx); err != nil {
log.Fatal("Server forced to shutdown:", err)
}
Expand Down