Merge pull request #6 from ssgreg/feature/initial

fix: nil instead of http.ErrServerClosed in RunServer
ssgreg · Oct 8, 2018 · a9aa26b · a9aa26b
2 parents 4e0bacb + b259e3d
commit a9aa26b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/server.go b/server.go
@@ -11,6 +11,8 @@ import (
 
 // RunServer starts the server synchronously with the given context, server
 // and listener. The server can be gracefully shut down using the given context.
+//
+// RunServer returns nil in case of ErrServerClosed.
 func RunServer(ctx context.Context, s *http.Server, l net.Listener) (err error) {
 	var shutdownError error
 	defer func() {
@@ -21,6 +23,9 @@ func RunServer(ctx context.Context, s *http.Server, l net.Listener) (err error)
 				fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 			}
 		}
+		if err == http.ErrServerClosed {
+			err = nil
+		}
 	}()
 
 	var wg sync.WaitGroup

diff --git a/server_test.go b/server_test.go
@@ -22,7 +22,7 @@ func Test_Shutdown(t *testing.T) {
 	}()
 
 	err = RunServer(context.Background(), &s, l)
-	require.Error(t, err, "http: Server closed")
+	require.NoError(t, err)
 }
 
 func Test_ShutdownWithContext(t *testing.T) {
@@ -37,5 +37,5 @@ func Test_ShutdownWithContext(t *testing.T) {
 
 	s := http.Server{}
 	err = RunServer(serverCtx, &s, l)
-	require.Error(t, err, "http: Server closed")
+	require.NoError(t, err)
 }