Merge branch 'master' into both-over-unix/tcp/tls

server.go

@@ -1,6 +1,7 @@
 package smtp
 
 import (
+	"context"
 	"crypto/tls"
 	"errors"
 	"io"
@@ -14,6 +15,10 @@ import (
 	"github.com/emersion/go-sasl"
 )
 
+var (
+	ErrServerClosed = errors.New("smtp: server already closed")
+)
+
 // A function that creates SASL servers.
 type SaslServerFactory func(conn *Conn) sasl.Server
 
@@ -62,6 +67,8 @@ type Server struct {
 	// The server backend.
 	Backend Backend
 
+	wg sync.WaitGroup
+
 	caps  []string
 	auths map[string]SaslServerFactory
 	done  chan struct{}
@@ -133,7 +140,11 @@ func (s *Server) Serve(l net.Listener) error {
 			}
 			return err
 		}
+
+		s.wg.Add(1)
 		go func() {
+			defer s.wg.Done()
+
 			err := s.handleConn(newConn(c, s))
 			if err != nil {
 				s.ErrorLog.Printf("handler error: %s", err)
@@ -261,7 +272,7 @@ func (s *Server) ListenAndServeTLS() error {
 func (s *Server) Close() error {
 	select {
 	case <-s.done:
-		return errors.New("smtp: server already closed")
+		return ErrServerClosed
 	default:
 		close(s.done)
 	}
@@ -282,6 +293,44 @@ func (s *Server) Close() error {
 	return err
 }
 
+// Shutdown gracefully shuts down the server without interrupting any
+// active connections. Shutdown works by first closing all open
+// listeners and then waiting indefinitely for connections to return to
+// idle and then shut down.
+// If the provided context expires before the shutdown is complete,
+// Shutdown returns the context's error, otherwise it returns any
+// error returned from closing the Server's underlying Listener(s).
+func (s *Server) Shutdown(ctx context.Context) error {
+	select {
+	case <-s.done:
+		return ErrServerClosed
+	default:
+		close(s.done)
+	}
+
+	var err error
+	s.locker.Lock()
+	for _, l := range s.listeners {
+		if lerr := l.Close(); lerr != nil && err == nil {
+			err = lerr
+		}
+	}
+	s.locker.Unlock()
+
+	connDone := make(chan struct{})
+	go func() {
+		defer close(connDone)
+		s.wg.Wait()
+	}()
+
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case <-connDone:
+		return err
+	}
+}
+
 // EnableAuth enables an authentication mechanism on this server.
 //
 // This function should not be called directly, it must only be used by

server_test.go

@@ -3,6 +3,7 @@ package smtp_test
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"errors"
 	"io"
 	"io/ioutil"
@@ -1234,3 +1235,33 @@ func TestServer_TooLongCommand(t *testing.T) {
 		t.Fatal("Invalid too long MAIL response:", scanner.Text())
 	}
 }
+
+func TestServerShutdown(t *testing.T) {
+	_, s, c, _ := testServerGreeted(t)
+
+	ctx := context.Background()
+	errChan := make(chan error)
+	go func() {
+		defer close(errChan)
+
+		errChan <- s.Shutdown(ctx)
+		errChan <- s.Shutdown(ctx)
+	}()
+
+	select {
+	case err := <-errChan:
+		t.Fatal("Expected no err because conn is open:", err)
+	default:
+		c.Close()
+	}
+
+	errOne := <-errChan
+	if errOne != nil {
+		t.Fatal("Expected err to be nil:", errOne)
+	}
+
+	errTwo := <-errChan
+	if errTwo != smtp.ErrServerClosed {
+		t.Fatal("Expected err to be ErrServerClosed:", errTwo)
+	}
+}