Merge pull request #25 from Mayank77maruti/master

Fix Daily CI

Author: alixander

xhttp/serve.go

@@ -36,9 +36,14 @@ func Serve(ctx context.Context, shutdownTimeout time.Duration, s *http.Server, l
 	case err := <-done:
 		return err
 	case <-ctx.Done():
-		ctx = xcontext.WithoutCancel(ctx)
-		ctx, cancel := context.WithTimeout(ctx, shutdownTimeout)
+		shutdownCtx := xcontext.WithoutCancel(ctx)
+		shutdownCtx, cancel := context.WithTimeout(shutdownCtx, shutdownTimeout)
 		defer cancel()
-		return s.Shutdown(ctx)
+		shutdownErr := s.Shutdown(shutdownCtx)
+		serveErr := <-done
+		if serveErr != nil && serveErr != http.ErrServerClosed {
+			return serveErr
+		}
+		return shutdownErr
 	}
 }