From c7dc9986708f44eca9fdf55e98bfe728e8b0150e Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Tue, 12 Mar 2024 00:50:08 +0300 Subject: [PATCH] fixup panic Signed-off-by: Vasiliy Tolstov --- http.go | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/http.go b/http.go index 2ababf9..11f8520 100644 --- a/http.go +++ b/http.go @@ -451,6 +451,7 @@ 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 @@ -461,16 +462,24 @@ func (h *Server) Start() error { var ok bool if hs, ok = h.opts.Context.Value(serverKey{}).(*http.Server); ok && hs != nil { hs.Handler = fn - } else { - hs = &http.Server{Handler: fn} + srvFunc = hs.Serve } } - go func() { - if cerr := hs.Serve(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) { - h.opts.Logger.Error(h.opts.Context, fmt.Sprint(cerr)) - } - }() + 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() { t := new(time.Ticker)