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

Update workflows #194

Closed
atolstikhin wants to merge 45 commits from (deleted):v3 into v3
pull from: (deleted):v3
merge into: unistack-org:v3
Conversation 0 Commits 45 Files Changed 39 -19
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 49608197d0 - Show all commits

19
http.go
View File

@@ -408,7 +408,6 @@ func (h *Server) Start() error {
h.Unlock() h.Unlock()
var handler http.Handler var handler http.Handler
//var srvFunc func(net.Listener) error
// nolint: nestif // nolint: nestif
if h.opts.Context != nil { if h.opts.Context != nil {
@@ -462,7 +461,6 @@ 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
//srvFunc = hs.Serve
} else { } else {
hs = &http.Server{Handler: fn} hs = &http.Server{Handler: fn}
} }
@@ -474,23 +472,6 @@ func (h *Server) Start() error {
} }
}() }()
/*
if srvFunc != nil {
go func() {
if cerr := srvFunc(ts); cerr != nil && !errors.Is(cerr, net.ErrClosed) {
h.opts.Logger.Error(h.opts.Context, cerr)
}
}()
} else {
go func() {
if cerr := http.Serve(ts, fn); cerr != nil && !errors.Is(cerr, net.ErrClosed) {
h.opts.Logger.Error(h.opts.Context, cerr)
}
}()
}
*/
go func() { go func() {
t := new(time.Ticker) t := new(time.Ticker)