mirror of
https://github.com/Sagit-chu/flvx.git
synced 2026-10-05 17:46:37 +08:00
fix(gost): filter expected net.ErrClosed noise in service handler
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
@@ -54,10 +54,10 @@ var needWrap = false
|
|||||||
|
|
||||||
// SetProtocolBlock sets protocol blocking switches and recomputes wrapper need
|
// SetProtocolBlock sets protocol blocking switches and recomputes wrapper need
|
||||||
func SetProtocolBlock(httpOn int, tlsOn int, socksOn int) {
|
func SetProtocolBlock(httpOn int, tlsOn int, socksOn int) {
|
||||||
isHttp = httpOn
|
isHttp = httpOn
|
||||||
isTls = tlsOn
|
isTls = tlsOn
|
||||||
isSocks = socksOn
|
isSocks = socksOn
|
||||||
needWrap = isTls+isSocks+isHttp > 0
|
needWrap = isTls+isSocks+isHttp > 0
|
||||||
}
|
}
|
||||||
|
|
||||||
type Option func(opts *options)
|
type Option func(opts *options)
|
||||||
@@ -292,7 +292,9 @@ func (s *defaultService) Serve() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if err := s.handler.Handle(ctx, conn); err != nil {
|
if err := s.handler.Handle(ctx, conn); err != nil {
|
||||||
log.Error(err)
|
if !errors.Is(err, net.ErrClosed) {
|
||||||
|
log.Error(err)
|
||||||
|
}
|
||||||
if v := xmetrics.GetCounter(xmetrics.MetricServiceHandlerErrorsCounter,
|
if v := xmetrics.GetCounter(xmetrics.MetricServiceHandlerErrorsCounter,
|
||||||
metrics.Labels{"service": s.name, "client": clientIP}); v != nil {
|
metrics.Labels{"service": s.name, "client": clientIP}); v != nil {
|
||||||
v.Inc()
|
v.Inc()
|
||||||
@@ -403,12 +405,12 @@ func (s *defaultService) observeStats(ctx context.Context) {
|
|||||||
TotalErrs: st.Get(stats.KindTotalErrs),
|
TotalErrs: st.Get(stats.KindTotalErrs),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
// 将流量累积到全局管理器,而不是立即上报
|
// 将流量累积到全局管理器,而不是立即上报
|
||||||
if outputBytes > 0 || inputBytes > 0 {
|
if outputBytes > 0 || inputBytes > 0 {
|
||||||
globalManager := GetGlobalTrafficManager()
|
globalManager := GetGlobalTrafficManager()
|
||||||
globalManager.AddTraffic(s.name, int64(outputBytes), int64(inputBytes))
|
globalManager.AddTraffic(s.name, int64(outputBytes), int64(inputBytes))
|
||||||
|
|
||||||
// 立即重置流量计数(因为已经记录到全局管理器中)
|
// 立即重置流量计数(因为已经记录到全局管理器中)
|
||||||
if xstats, ok := st.(*xstats.Stats); ok {
|
if xstats, ok := st.(*xstats.Stats); ok {
|
||||||
xstats.ResetTraffic(st.Get(stats.KindInputBytes)-inputBytes, st.Get(stats.KindOutputBytes)-outputBytes)
|
xstats.ResetTraffic(st.Get(stats.KindInputBytes)-inputBytes, st.Get(stats.KindOutputBytes)-outputBytes)
|
||||||
|
|||||||
Reference in New Issue
Block a user