From 52c2301b3e1cbb6235edfc10058b38f9fc981665 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Mon, 27 Apr 2020 17:08:12 +0800 Subject: [PATCH] chore(http): ignore ErrServerClosed error (#505) --- gorush/server_normal.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gorush/server_normal.go b/gorush/server_normal.go index 3b7b674..d596e5f 100644 --- a/gorush/server_normal.go +++ b/gorush/server_normal.go @@ -81,7 +81,10 @@ func listenAndServe(ctx context.Context, s *http.Server) error { } }) g.Go(func() error { - return s.ListenAndServe() + if err := s.ListenAndServe(); err != nil && err != http.ErrServerClosed { + return err + } + return nil }) return g.Wait() } @@ -98,7 +101,10 @@ func listenAndServeTLS(ctx context.Context, s *http.Server) error { } }) g.Go(func() error { - return s.ListenAndServeTLS("", "") + if err := s.ListenAndServeTLS("", ""); err != nil && err != http.ErrServerClosed { + return err + } + return nil }) return g.Wait() }