Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Close idle connections after graceful shutdown timeout

Browse source
This commit is contained in:
Benny Ng 2016-06-07 13:01:03 +08:00
parent b23eec4fac
commit 37ae21001d
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
caddyhttp/httpserver/server.go
View file

@ -52,6 +52,16 @@ func NewServer(addr string, group []*SiteConfig) (*Server, error) {
connTimeout: GracefulTimeout, connTimeout: GracefulTimeout,
} }
s.Server.Handler = s // this is weird, but whatever s.Server.Handler = s // this is weird, but whatever
s.Server.ConnState = func(c net.Conn, cs http.ConnState) {
if cs == http.StateIdle {
s.listenerMu.Lock()
// server stopped, close idle connection
if s.listener == nil {
c.Close()
}
s.listenerMu.Unlock()
}
}
// Disable HTTP/2 if desired // Disable HTTP/2 if desired
if !HTTP2 { if !HTTP2 {
@ -288,6 +298,7 @@ func (s *Server) Stop() (err error) {
s.listenerMu.Lock() s.listenerMu.Lock()
if s.listener != nil { if s.listener != nil {
err = s.listener.Close() err = s.listener.Close()
s.listener = nil
} }
s.listenerMu.Unlock() s.listenerMu.Unlock()