server: Don't close pending connections after Shutdown
This commit is contained in:
parent
49dac34aff
commit
0a3db2ce41
54
server.go
54
server.go
@ -7,6 +7,7 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
"sync"
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -48,10 +49,16 @@ type Server struct {
|
|||||||
listeners map[*net.Listener]context.CancelFunc
|
listeners map[*net.Listener]context.CancelFunc
|
||||||
conns map[*net.Conn]context.CancelFunc
|
conns map[*net.Conn]context.CancelFunc
|
||||||
doneChan chan struct{}
|
doneChan chan struct{}
|
||||||
closed bool
|
status int32
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
serverOk int32 = iota
|
||||||
|
serverShutdown
|
||||||
|
serverClosed
|
||||||
|
)
|
||||||
|
|
||||||
// done returns a channel that's closed when the server has finished closing.
|
// done returns a channel that's closed when the server has finished closing.
|
||||||
func (srv *Server) done() chan struct{} {
|
func (srv *Server) done() chan struct{} {
|
||||||
srv.mu.Lock()
|
srv.mu.Lock()
|
||||||
@ -66,20 +73,16 @@ func (srv *Server) doneLocked() chan struct{} {
|
|||||||
return srv.doneChan
|
return srv.doneChan
|
||||||
}
|
}
|
||||||
|
|
||||||
func (srv *Server) isClosed() bool {
|
// rejectingListeners reports whether the server is rejecting new listeners
|
||||||
srv.mu.Lock()
|
// (e.g. after Shutdown or Close has been called).
|
||||||
defer srv.mu.Unlock()
|
func (srv *Server) rejectingListeners() bool {
|
||||||
return srv.closed
|
return atomic.LoadInt32(&srv.status) != serverOk
|
||||||
}
|
}
|
||||||
|
|
||||||
func (srv *Server) tryClose() bool {
|
// rejectingConns reports whether the server is rejecting new connections
|
||||||
srv.mu.Lock()
|
// (e.g. after Close has been called).
|
||||||
defer srv.mu.Unlock()
|
func (srv *Server) rejectingConns() bool {
|
||||||
if srv.closed {
|
return atomic.LoadInt32(&srv.status) == serverClosed
|
||||||
return false
|
|
||||||
}
|
|
||||||
srv.closed = true
|
|
||||||
return true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// tryFinishShutdown closes srv.done() if there are no active listeners or requests.
|
// tryFinishShutdown closes srv.done() if there are no active listeners or requests.
|
||||||
@ -99,7 +102,7 @@ func (srv *Server) tryFinishShutdown() {
|
|||||||
// Close immediately closes all active net.Listeners and connections.
|
// Close immediately closes all active net.Listeners and connections.
|
||||||
// For a graceful shutdown, use Shutdown.
|
// For a graceful shutdown, use Shutdown.
|
||||||
func (srv *Server) Close() error {
|
func (srv *Server) Close() error {
|
||||||
if !srv.tryClose() {
|
if !atomic.CompareAndSwapInt32(&srv.status, serverOk, serverClosed) {
|
||||||
return ErrServerClosed
|
return ErrServerClosed
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -133,9 +136,10 @@ func (srv *Server) Close() error {
|
|||||||
// Once Shutdown has been called on a server, it may not be reused;
|
// Once Shutdown has been called on a server, it may not be reused;
|
||||||
// future calls to methods such as Serve will return ErrServerClosed.
|
// future calls to methods such as Serve will return ErrServerClosed.
|
||||||
func (srv *Server) Shutdown(ctx context.Context) error {
|
func (srv *Server) Shutdown(ctx context.Context) error {
|
||||||
if !srv.tryClose() {
|
if !atomic.CompareAndSwapInt32(&srv.status, serverOk, serverShutdown) {
|
||||||
return ErrServerClosed
|
return ErrServerClosed
|
||||||
}
|
}
|
||||||
|
defer atomic.StoreInt32(&srv.status, serverClosed)
|
||||||
|
|
||||||
// Close active listeners.
|
// Close active listeners.
|
||||||
srv.mu.Lock()
|
srv.mu.Lock()
|
||||||
@ -162,7 +166,7 @@ func (srv *Server) Shutdown(ctx context.Context) error {
|
|||||||
// ListenAndServe always returns a non-nil error. After Shutdown or Close, the
|
// ListenAndServe always returns a non-nil error. After Shutdown or Close, the
|
||||||
// returned error is ErrServerClosed.
|
// returned error is ErrServerClosed.
|
||||||
func (srv *Server) ListenAndServe(ctx context.Context) error {
|
func (srv *Server) ListenAndServe(ctx context.Context) error {
|
||||||
if srv.isClosed() {
|
if srv.rejectingListeners() {
|
||||||
return ErrServerClosed
|
return ErrServerClosed
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -192,11 +196,11 @@ func (srv *Server) getCertificate(h *tls.ClientHelloInfo) (*tls.Certificate, err
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (srv *Server) trackListener(l *net.Listener, cancel context.CancelFunc) bool {
|
func (srv *Server) trackListener(l *net.Listener, cancel context.CancelFunc) bool {
|
||||||
srv.mu.Lock()
|
if srv.rejectingListeners() {
|
||||||
defer srv.mu.Unlock()
|
|
||||||
if srv.closed {
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
srv.mu.Lock()
|
||||||
|
defer srv.mu.Unlock()
|
||||||
if srv.listeners == nil {
|
if srv.listeners == nil {
|
||||||
srv.listeners = make(map[*net.Listener]context.CancelFunc)
|
srv.listeners = make(map[*net.Listener]context.CancelFunc)
|
||||||
}
|
}
|
||||||
@ -235,7 +239,7 @@ func (srv *Server) Serve(ctx context.Context, l net.Listener) error {
|
|||||||
|
|
||||||
select {
|
select {
|
||||||
case <-lnctx.Done():
|
case <-lnctx.Done():
|
||||||
if srv.isClosed() {
|
if srv.rejectingListeners() {
|
||||||
return ErrServerClosed
|
return ErrServerClosed
|
||||||
}
|
}
|
||||||
return lnctx.Err()
|
return lnctx.Err()
|
||||||
@ -271,11 +275,11 @@ func (srv *Server) serve(ctx context.Context, l net.Listener) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (srv *Server) trackConn(conn *net.Conn, cancel context.CancelFunc) bool {
|
func (srv *Server) trackConn(conn *net.Conn, cancel context.CancelFunc) bool {
|
||||||
srv.mu.Lock()
|
if srv.rejectingConns() {
|
||||||
defer srv.mu.Unlock()
|
|
||||||
if srv.closed {
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
srv.mu.Lock()
|
||||||
|
defer srv.mu.Unlock()
|
||||||
if srv.conns == nil {
|
if srv.conns == nil {
|
||||||
srv.conns = make(map[*net.Conn]context.CancelFunc)
|
srv.conns = make(map[*net.Conn]context.CancelFunc)
|
||||||
}
|
}
|
||||||
@ -291,6 +295,7 @@ func (srv *Server) deleteConn(conn *net.Conn) {
|
|||||||
|
|
||||||
// ServeConn serves a Gemini response over the provided connection.
|
// ServeConn serves a Gemini response over the provided connection.
|
||||||
// It closes the connection when the response has been completed.
|
// It closes the connection when the response has been completed.
|
||||||
|
// Note that ServeConn will succeed even if a Shutdown is in progress.
|
||||||
func (srv *Server) ServeConn(ctx context.Context, conn net.Conn) error {
|
func (srv *Server) ServeConn(ctx context.Context, conn net.Conn) error {
|
||||||
defer conn.Close()
|
defer conn.Close()
|
||||||
|
|
||||||
@ -317,6 +322,9 @@ func (srv *Server) ServeConn(ctx context.Context, conn net.Conn) error {
|
|||||||
|
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
|
if srv.rejectingConns() {
|
||||||
|
return ErrServerClosed
|
||||||
|
}
|
||||||
return ctx.Err()
|
return ctx.Err()
|
||||||
case err := <-errch:
|
case err := <-errch:
|
||||||
return err
|
return err
|
||||||
|
Loading…
Reference in New Issue
Block a user