Mirror/mochi
1
0
Fork 0
mirror of https://github.com/sot-tech/mochi.git synced 2026-07-17 21:58:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

http: fix HTTP shutdown panicking

Browse Source
This commit is contained in:
Leo Balduf
2017-04-04 16:05:09 +02:00
parent ea1324602e
commit 2e625af44d
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/http/frontend.go
+3 -4
View File
@@ -5,6 +5,7 @@ package http
import (
"context"
"crypto/tls"
"errors"
"net"
"net/http"
"time"
@@ -144,10 +145,8 @@ func (t *Frontend) ListenAndServe() error {
}
// Start the HTTP server and gracefully handle any network errors.
if err := t.s.ListenAndServe(); err != nil {
if opErr, ok := err.(*net.OpError); !ok || (ok && opErr.Op != "accept") {
panic("http: failed to gracefully run HTTP server: " + err.Error())
}
if err := t.s.ListenAndServe(); err != nil && err != http.ErrServerClosed {
return errors.New("http: failed to run HTTP server: " + err.Error())
}
return nil