Add TLSServer interface and ListenAndServeTLS func

Closes #1

https://github.com/denji/golang-tls

openssl req -x509 -nodes -newkey ec:<(openssl ecparam -name secp384r1) -keyout server.key -out server.crt -days 36500

Author: peterhellberg

graceful.go

@@ -68,6 +68,12 @@ type Server interface {
 	Shutdowner
 }
 
+// TLSServer is implemented by *http.Server
+type TLSServer interface {
+	ListenAndServeTLS(string, string) error
+	Shutdowner
+}
+
 // Shutdowner is implemented by *http.Server, and optionally by *http.Server.Handler
 type Shutdowner interface {
 	Shutdown(ctx context.Context) error
@@ -101,15 +107,8 @@ var (
 
 // LogListenAndServe logs using the logger and then calls ListenAndServe
 func LogListenAndServe(s Server, loggers ...Logger) {
-	if len(loggers) > 0 {
-		if logger = loggers[0]; logger == nil {
-			logger = log.New(ioutil.Discard, "", 0)
-		}
-	} else {
-		logger = log.New(os.Stdout, "", 0)
-	}
-
 	if hs, ok := s.(*http.Server); ok {
+		logger := getLogger(loggers...)
 		logger.Printf(ListeningFormat, hs.Addr)
 	}
 
@@ -127,6 +126,17 @@ func ListenAndServe(s Server) {
 	Shutdown(s)
 }
 
+// ListenAndServeTLS starts the server in a goroutine and then calls Shutdown
+func ListenAndServeTLS(s TLSServer, certFile, keyFile string) {
+	go func() {
+		if err := s.ListenAndServeTLS(certFile, keyFile); err != http.ErrServerClosed {
+			logger.Fatal(err)
+		}
+	}()
+
+	Shutdown(s)
+}
+
 // Shutdown blocks until os.Interrupt or syscall.SIGTERM received, then
 // running *http.Server.Shutdown with a context having a timeout
 func Shutdown(s Shutdowner) {
@@ -199,3 +209,15 @@ func shutdown(s Shutdowner, logger Logger) {
 		}
 	}
 }
+
+func getLogger(loggers ...Logger) Logger {
+	if len(loggers) > 0 {
+		if logger = loggers[0]; logger != nil {
+			return logger
+		}
+
+		return log.New(ioutil.Discard, "", 0)
+	}
+
+	return log.New(os.Stdout, "", 0)
+}

graceful_test.go

@@ -12,6 +12,31 @@ import (
 	"time"
 )
 
+func TestListenAndServeTLS(t *testing.T) {
+	var buf bytes.Buffer
+
+	logger := log.New(&buf, "", 0)
+
+	go func() {
+		time.Sleep(10 * time.Millisecond)
+		signals <- os.Interrupt
+	}()
+
+	ListenAndServeTLS(&http.Server{
+		Addr: ":0", Handler: &testHandler{logger},
+	}, "testdata/server.crt", "testdata/server.key")
+
+	s := buf.String()
+
+	for _, want := range []string{
+		"Shutdown in testHandler",
+	} {
+		if !strings.Contains(s, want) {
+			t.Fatalf("log output does not include %q", want)
+		}
+	}
+}
+
 func TestLogListenAndServe(t *testing.T) {
 	t.Run("with logger", func(t *testing.T) {
 		var buf bytes.Buffer

testdata/server.crt

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICDTCCAZMCCQChBedS1gduPTAKBggqhkjOPQQDAjBvMQswCQYDVQQGEwJTVjES
+MBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xHTAbBgNVBAoM
+FEJvbm5pZXIgQnJvYWRjYXN0aW5nMRkwFwYDVQQDDBBncmFjZWZ1bC5leGFtcGxl
+MCAXDTE3MTAxNjA4NDUyM1oYDzIxMTcwOTIyMDg0NTIzWjBvMQswCQYDVQQGEwJT
+VjESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xHTAbBgNV
+BAoMFEJvbm5pZXIgQnJvYWRjYXN0aW5nMRkwFwYDVQQDDBBncmFjZWZ1bC5leGFt
+cGxlMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAENFLl8QvLSQy3mB2lQmqbhZNnOSQz
+LnLutoiEi4L691l8VEXE15w8J8WqAJTVnruRLeSnh+yBDnNU3czL6c/g5Xx6405G
+arpbiHa2MIKtFieIOkUVx+cy1vIlUne3agr6MAoGCCqGSM49BAMCA2gAMGUCMAlC
+ahkvya6AGs0XRAjYJ4SFc7xUEJWFO5rBXTfVHfxJkYm0iqg17CMYE0lDafn9JAIx
+AK7QCsyknAcbFqYekcOikgzb5mTJu0lKlMXFV0aoMzzF4PtWnWXEUoZETqEbM53X
+3g==
+-----END CERTIFICATE-----

testdata/server.key

@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDAwDcuspvTdQHjrC7tY
+sr5CXznWZ67QTdGwW60NEpNy4gYDyAmDtHzSNYeb46N1W8ChZANiAAQ0UuXxC8tJ
+DLeYHaVCapuFk2c5JDMucu62iISLgvr3WXxURcTXnDwnxaoAlNWeu5Et5KeH7IEO
+c1TdzMvpz+DlfHrjTkZquluIdrYwgq0WJ4g6RRXH5zLW8iVSd7dqCvo=
+-----END PRIVATE KEY-----