starred/godoxy-yusing
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-23 16:58:31 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

improve reverse proxy and serverhandling

Browse Source 
- buffer pool for IO copy
  - flush response after read, now works with event stream
  - fixed error handling for server
This commit is contained in:
yusing
2025-02-13 18:39:35 +08:00
parent 6bf4846ae8
commit 19e3392825
7 changed files with 132 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/net/http/reverseproxy/reverse_proxy_mod.go
View File

@@ -410,15 +410,13 @@ func (p *ReverseProxy) handler(rw http.ResponseWriter, req *http.Request) {
rw.WriteHeader(res.StatusCode)
_, err = io.Copy(rw, res.Body)
err = U.CopyClose(U.NewContextWriter(ctx, rw), U.NewContextReader(ctx, res.Body)) // close now, instead of defer, to populate res.Trailer
if err != nil {
if !errors.Is(err, context.Canceled) {
p.errorHandler(rw, req, err, true)
}
res.Body.Close()
return
}
res.Body.Close() // close now, instead of defer, to populate res.Trailer
if len(res.Trailer) > 0 {
// Force chunking if we saw a response trailer.

4
internal/net/http/server/error.go
View File

@@ -8,11 +8,11 @@ import (
"github.com/rs/zerolog"
)
func HandleError(logger *zerolog.Logger, err error) {
func HandleError(logger *zerolog.Logger, err error, msg string) {
switch {
case err == nil, errors.Is(err, http.ErrServerClosed), errors.Is(err, context.Canceled):
return
default:
logger.Fatal().Err(err).Msg("server error")
logger.Fatal().Err(err).Msg(msg)
}
}

33
internal/net/http/server/server.go
View File

@@ -99,7 +99,10 @@ func (s *Server) Start(parent task.Parent) {
s.startTime = time.Now()
if s.http != nil {
go func() {
s.handleErr(s.http.ListenAndServe())
err := s.http.ListenAndServe()
if err != nil {
s.handleErr(err, "failed to serve http server")
}
}()
s.httpStarted = true
s.l.Info().Str("addr", s.http.Addr).Msg("server started")
@@ -109,11 +112,11 @@ func (s *Server) Start(parent task.Parent) {
go func() {
l, err := net.Listen("tcp", s.https.Addr)
if err != nil {
s.handleErr(err)
s.handleErr(err, "failed to listen on port")
return
}
defer l.Close()
s.handleErr(s.https.Serve(tls.NewListener(l, s.https.TLSConfig)))
s.handleErr(s.https.Serve(tls.NewListener(l, s.https.TLSConfig)), "failed to serve https server")
}()
s.httpsStarted = true
s.l.Info().Str("addr", s.https.Addr).Msgf("server started")
@@ -131,15 +134,23 @@ func (s *Server) stop() {
defer cancel()
if s.http != nil && s.httpStarted {
s.handleErr(s.http.Shutdown(ctx))
s.httpStarted = false
s.l.Info().Str("addr", s.http.Addr).Msgf("server stopped")
err := s.http.Shutdown(ctx)
if err != nil {
s.handleErr(err, "failed to shutdown http server")
} else {
s.httpStarted = false
s.l.Info().Str("addr", s.http.Addr).Msgf("server stopped")
}
}
if s.https != nil && s.httpsStarted {
s.handleErr(s.https.Shutdown(ctx))
s.httpsStarted = false
s.l.Info().Str("addr", s.https.Addr).Msgf("server stopped")
err := s.https.Shutdown(ctx)
if err != nil {
s.handleErr(err, "failed to shutdown https server")
} else {
s.httpsStarted = false
s.l.Info().Str("addr", s.https.Addr).Msgf("server stopped")
}
}
}
@@ -147,6 +158,6 @@ func (s *Server) Uptime() time.Duration {
return time.Since(s.startTime)
}
func (s *Server) handleErr(err error) {
HandleError(&s.l, err)
func (s *Server) handleErr(err error, msg string) {
HandleError(&s.l, err, msg)
}