Fixed http listener error. (#843)
This commit is contained in:
@@ -23,7 +23,7 @@ func StartHttps(host string, port int, certFile, keyFile string, handler http.Ha
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func start(host string, port int, handler http.Handler, run func(srv *http.Server) error) error {
|
func start(host string, port int, handler http.Handler, run func(srv *http.Server) error) (err error) {
|
||||||
server := &http.Server{
|
server := &http.Server{
|
||||||
Addr: fmt.Sprintf("%s:%d", host, port),
|
Addr: fmt.Sprintf("%s:%d", host, port),
|
||||||
Handler: handler,
|
Handler: handler,
|
||||||
@@ -31,7 +31,11 @@ func start(host string, port int, handler http.Handler, run func(srv *http.Serve
|
|||||||
waitForCalled := proc.AddWrapUpListener(func() {
|
waitForCalled := proc.AddWrapUpListener(func() {
|
||||||
server.Shutdown(context.Background())
|
server.Shutdown(context.Background())
|
||||||
})
|
})
|
||||||
defer waitForCalled()
|
defer func() {
|
||||||
|
if err == http.ErrServerClosed {
|
||||||
|
waitForCalled()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
return run(server)
|
return run(server)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user