From 3514bb96268111d8175b863f8ffdd6119cfb0d5d Mon Sep 17 00:00:00 2001 From: Evstigneev Denis Date: Wed, 13 Mar 2024 10:05:29 +0300 Subject: [PATCH] update http.Server run --- http.go | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/http.go b/http.go index 11f8520..d8f41e9 100644 --- a/http.go +++ b/http.go @@ -451,7 +451,6 @@ func (h *Server) Start() error { fn := handler var hs *http.Server - var srvFunc func(net.Listener) error if h.opts.Context != nil { if mwf, ok := h.opts.Context.Value(middlewareKey{}).([]func(http.Handler) http.Handler); ok && len(mwf) > 0 { // wrap the handler func @@ -462,24 +461,16 @@ func (h *Server) Start() error { var ok bool if hs, ok = h.opts.Context.Value(serverKey{}).(*http.Server); ok && hs != nil { hs.Handler = fn - srvFunc = hs.Serve + } else { + hs = &http.Server{Handler: fn} } } - if srvFunc != nil { - go func() { - if cerr := srvFunc(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) { - h.opts.Logger.Error(h.opts.Context, "failed to serve", cerr) - } - }() - } else { - go func() { - hs = &http.Server{Handler: fn} - if cerr := hs.Serve(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) { - h.opts.Logger.Error(h.opts.Context, "failed to serve", cerr) - } - }() - } + go func() { + if cerr := hs.Serve(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) { + h.opts.Logger.Error(h.opts.Context, cerr) + } + }() go func() { t := new(time.Ticker)