unistack-org/micro-server-http
4
0
Fork 3
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases 116 Wiki Activity

fixup panic

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2024-03-12 00:50:08 +03:00
parent 954101f887
commit c7dc998670
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
http.go
View File

@ -451,6 +451,7 @@ func (h *Server) Start() error {
fn := handler fn := handler
var hs *http.Server var hs *http.Server
var srvFunc func(net.Listener) error
if h.opts.Context != nil { if h.opts.Context != nil {
if mwf, ok := h.opts.Context.Value(middlewareKey{}).([]func(http.Handler) http.Handler); ok && len(mwf) > 0 { if mwf, ok := h.opts.Context.Value(middlewareKey{}).([]func(http.Handler) http.Handler); ok && len(mwf) > 0 {
// wrap the handler func // wrap the handler func
@ -461,16 +462,24 @@ func (h *Server) Start() error {
var ok bool var ok bool
if hs, ok = h.opts.Context.Value(serverKey{}).(*http.Server); ok && hs != nil { if hs, ok = h.opts.Context.Value(serverKey{}).(*http.Server); ok && hs != nil {
hs.Handler = fn hs.Handler = fn
} else { srvFunc = hs.Serve
hs = &http.Server{Handler: fn}
} }
} }
if srvFunc != nil {
go func() { go func() {
if cerr := hs.Serve(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) { if cerr := srvFunc(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) {
h.opts.Logger.Error(h.opts.Context, fmt.Sprint(cerr)) 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() { go func() {
t := new(time.Ticker) t := new(time.Ticker)