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

refactor: replace gperr.Builder with gperr.Group for concurrent error handling

Browse Source 
- Updated various files to utilize gperr.Group for cleaner concurrency error handling.
- Removed sync.WaitGroup usage, simplifying the code structure.
- Ensured consistent error reporting across different components.
This commit is contained in:
yusing
2026-01-06 16:29:35 +08:00
parent 724617a2b3
commit 424398442b
9 changed files with 62 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/net/gphttp/loadbalancer/loadbalancer.go
View File

@@ -13,7 +13,6 @@ import (
gperr "github.com/yusing/goutils/errs"
"github.com/yusing/goutils/pool"
"github.com/yusing/goutils/task"
"golang.org/x/sync/errgroup"
)
// TODO: stats of each server.
@@ -223,7 +222,7 @@ func (lb *LoadBalancer) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
return
}
if r.URL.Path == idlewatcher.WakeEventsPath {
var errs errgroup.Group
var errs gperr.Group
// wake all servers
for _, srv := range srvs {
errs.Go(func() error {
@@ -234,7 +233,7 @@ func (lb *LoadBalancer) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
return nil
})
}
if err := errs.Wait(); err != nil {
if err := errs.Wait().Error(); err != nil {
gperr.LogWarn("failed to wake some servers", err, &lb.l)
}
}

14
internal/net/gphttp/middleware/middleware_builder.go
View File

@@ -43,8 +43,8 @@ func BuildMiddlewaresFromYAML(source string, data []byte, eb *gperr.Builder) map
func compileMiddlewares(middlewaresMap map[string]OptionsRaw) ([]*Middleware, gperr.Error) {
middlewares := make([]*Middleware, 0, len(middlewaresMap))
errs := gperr.NewBuilder()
invalidOpts := gperr.NewBuilder()
var errs gperr.Builder
var invalidOpts gperr.Builder
for name, opts := range middlewaresMap {
m, err := Get(name)
@@ -55,7 +55,7 @@ func compileMiddlewares(middlewaresMap map[string]OptionsRaw) ([]*Middleware, gp
m, err = m.New(opts)
if err != nil {
invalidOpts.Add(err.Subject("middlewares." + name))
invalidOpts.AddSubjectf(err, "middlewares.%s", name)
continue
}
middlewares = append(middlewares, m)
@@ -78,23 +78,23 @@ func BuildMiddlewareFromMap(name string, middlewaresMap map[string]OptionsRaw) (
// TODO: check conflict or duplicates.
func BuildMiddlewareFromChainRaw(name string, defs []map[string]any) (*Middleware, gperr.Error) {
chainErr := gperr.NewBuilder("")
var chainErr gperr.Builder
chain := make([]*Middleware, 0, len(defs))
for i, def := range defs {
if def["use"] == nil || def["use"] == "" {
chainErr.Add(ErrMissingMiddlewareUse.Subjectf("%s[%d]", name, i))
chainErr.AddSubjectf(ErrMissingMiddlewareUse, "%s[%d]", name, i)
continue
}
baseName := def["use"].(string)
base, err := Get(baseName)
if err != nil {
chainErr.Add(err.Subjectf("%s[%d]", name, i))
chainErr.AddSubjectf(err, "%s[%d]", name, i)
continue
}
delete(def, "use")
m, err := base.New(def)
if err != nil {
chainErr.Add(err.Subjectf("%s[%d]", name, i))
chainErr.AddSubjectf(err, "%s[%d]", name, i)
continue
}
m.name = fmt.Sprintf("%s[%d]", name, i)