starred/godoxy-yusing
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2026-04-21 07:51:28 +02:00
Code Issues 18 Packages Projects Releases 10 Wiki Activity

refactor(rules): defer error logging until after FlushRelease

Browse Source 
Split error handling into isUnexpectedError predicate and logFlushError
function. Use rm.AppendError() to collect unexpected errors during rule
execution, then log after FlushRelease completes rather than immediately.
Also updates goutils dependency for AppendError method availability.
This commit is contained in:
yusing
2026-02-23 23:09:24 +08:00
parent faecbab2cb
commit 9bb5c54e7c
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
goutils

Submodule goutils updated: 482b5bca9f...3be815cb6e

34
internal/route/rules/rules.go
View File

@@ -288,7 +288,7 @@ func (rules Rules) BuildHandler(up http.HandlerFunc) http.HandlerFunc {
rm := httputils.NewResponseModifier(w) rm := httputils.NewResponseModifier(w)
defer func() { defer func() {
if _, err := rm.FlushRelease(); err != nil { if _, err := rm.FlushRelease(); err != nil {
logError(err, r) logFlushError(err, r)
} }
}() }()
@@ -323,7 +323,10 @@ func (rules Rules) BuildHandler(up http.HandlerFunc) http.HandlerFunc {
preTerminated = true preTerminated = true
continue continue
} }
logError(err, r) if isUnexpectedError(err) {
// will logged by logFlushError after FlushRelease
rm.AppendError("executing pre rule (%s): %w", rule.Do.raw, err)
}
hasError = true hasError = true
} }
} }
@@ -346,7 +349,10 @@ func (rules Rules) BuildHandler(up http.HandlerFunc) http.HandlerFunc {
if errors.Is(err, errTerminateRule) { if errors.Is(err, errTerminateRule) {
continue continue
} }
logError(err, r) if isUnexpectedError(err) {
// will logged by logFlushError after FlushRelease
rm.AppendError("executing post rule (%s): %w", rule.Do.raw, err)
}
} }
} }
@@ -361,13 +367,19 @@ func (rules Rules) BuildHandler(up http.HandlerFunc) http.HandlerFunc {
if errors.Is(err, errTerminateRule) { if errors.Is(err, errTerminateRule) {
continue continue
} }
logError(err, r) if isUnexpectedError(err) {
// will logged by logFlushError after FlushRelease
rm.AppendError("executing pre rule (%s): %w", rule.Do.raw, err)
}
} }
if err := execPostCommand(rule.Do, rm, r); err != nil { if err := execPostCommand(rule.Do, rm, r); err != nil {
if errors.Is(err, errTerminateRule) { if errors.Is(err, errTerminateRule) {
continue continue
} }
logError(err, r) if isUnexpectedError(err) {
// will logged by logFlushError after FlushRelease
rm.AppendError("executing post rule (%s): %w", rule.Do.raw, err)
}
} }
} }
} }
@@ -390,14 +402,14 @@ var errStreamClosed error
//go:linkname errClientDisconnected golang.org/x/net/http2.errClientDisconnected //go:linkname errClientDisconnected golang.org/x/net/http2.errClientDisconnected
var errClientDisconnected error var errClientDisconnected error
func logError(err error, r *http.Request) { func isUnexpectedError(err error) bool {
if errors.Is(err, errStreamClosed) || errors.Is(err, errClientDisconnected) { if errors.Is(err, errStreamClosed) || errors.Is(err, errClientDisconnected) {
return return false
} }
if h2Err, ok := errors.AsType[http2.StreamError](err); ok { if h2Err, ok := errors.AsType[http2.StreamError](err); ok {
// ignore these errors // ignore these errors
if h2Err.Code == http2.ErrCodeStreamClosed { if h2Err.Code == http2.ErrCodeStreamClosed {
return return false
} }
} }
if h3Err, ok := errors.AsType[*http3.Error](err); ok { if h3Err, ok := errors.AsType[*http3.Error](err); ok {
@@ -406,8 +418,12 @@ func logError(err error, r *http.Request) {
case case
http3.ErrCodeNoError, http3.ErrCodeNoError,
http3.ErrCodeRequestCanceled: http3.ErrCodeRequestCanceled:
return return false
} }
} }
return true
}
func logFlushError(err error, r *http.Request) {
log.Err(err).Str("method", r.Method).Str("url", r.Host+r.URL.Path).Msg("error executing rules") log.Err(err).Str("method", r.Method).Str("url", r.Host+r.URL.Path).Msg("error executing rules")
} }