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

refactor(errs): migrate from gperr.Error to standard Go error interface

Browse Source 
This is a large-scale refactoring across the codebase that replaces the custom
`gperr.Error` type with Go's standard `error` interface. The changes include:

- Replacing `gperr.Error` return types with `error` in function signatures
- Using `errors.New()` and `fmt.Errorf()` instead of `gperr.New()` and `gperr.Errorf()`
- Using `%w` format verb for error wrapping instead of `.With()` method
- Replacing `gperr.Subject()` calls with `gperr.PrependSubject()`
- Converting error logging from `gperr.Log*()` functions to zerolog's `.Err().Msg()` pattern
- Update NewLogger to handle multiline error message
- Updating `goutils` submodule to latest commit

This refactoring aligns with Go idioms and removes the dependency on
custom error handling abstractions in favor of standard library patterns.
This commit is contained in:
yusing
2026-02-08 12:07:36 +08:00
parent 7eb2a78041
commit 6da7227f9b
118 changed files with 572 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/watcher/directory_watcher.go
View File

@@ -10,7 +10,6 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/yusing/godoxy/internal/watcher/events"
gperr "github.com/yusing/goutils/errs"
"github.com/yusing/goutils/task"
)
@@ -24,7 +23,7 @@ type DirWatcher struct {
mu sync.Mutex
eventCh chan Event
errCh chan gperr.Error
errCh chan error
task *task.Task
}
@@ -55,14 +54,14 @@ func NewDirectoryWatcher(parent task.Parent, dirPath string) *DirWatcher {
w: w,
fwMap: make(map[string]*fileWatcher),
eventCh: make(chan Event),
errCh: make(chan gperr.Error),
errCh: make(chan error),
task: parent.Subtask("dir_watcher("+dirPath+")", true),
}
go helper.start()
return helper
}
func (h *DirWatcher) Events(_ context.Context) (<-chan Event, <-chan gperr.Error) {
func (h *DirWatcher) Events(_ context.Context) (<-chan Event, <-chan error) {
return h.eventCh, h.errCh
}
@@ -78,7 +77,7 @@ func (h *DirWatcher) Add(relPath string) Watcher {
s = &fileWatcher{
relPath: relPath,
eventCh: make(chan Event),
errCh: make(chan gperr.Error),
errCh: make(chan error),
}
h.fwMap[relPath] = s
return s
@@ -162,7 +161,7 @@ func (h *DirWatcher) start() {
return
}
select {
case h.errCh <- gperr.Wrap(err):
case h.errCh <- err:
default:
}
}

18
internal/watcher/docker_watcher.go
View File

@@ -3,6 +3,7 @@ package watcher
import (
"context"
"errors"
"fmt"
"time"
dockerEvents "github.com/moby/moby/api/types/events"
@@ -11,7 +12,6 @@ import (
"github.com/yusing/godoxy/internal/docker"
"github.com/yusing/godoxy/internal/types"
"github.com/yusing/godoxy/internal/watcher/events"
gperr "github.com/yusing/goutils/errs"
)
type (
@@ -82,18 +82,18 @@ func NewDockerWatcher(dockerCfg types.DockerProviderConfig) DockerWatcher {
}
}
func (w DockerWatcher) Events(ctx context.Context) (<-chan Event, <-chan gperr.Error) {
func (w DockerWatcher) Events(ctx context.Context) (<-chan Event, <-chan error) {
return w.EventsWithOptions(ctx, optionsDefault)
}
func (w DockerWatcher) EventsWithOptions(ctx context.Context, options DockerListOptions) (<-chan Event, <-chan gperr.Error) {
func (w DockerWatcher) EventsWithOptions(ctx context.Context, options DockerListOptions) (<-chan Event, <-chan error) {
eventCh := make(chan Event)
errCh := make(chan gperr.Error)
errCh := make(chan error)
go func() {
client, err := docker.NewClient(w.cfg)
if err != nil {
errCh <- gperr.Wrap(err, "docker watcher: failed to initialize client")
errCh <- fmt.Errorf("docker watcher: failed to initialize client: %w", err)
return
}
@@ -148,14 +148,14 @@ func (w DockerWatcher) EventsWithOptions(ctx context.Context, options DockerList
return eventCh, errCh
}
func (w DockerWatcher) parseError(err error) gperr.Error {
func (w DockerWatcher) parseError(err error) error {
if errors.Is(err, context.DeadlineExceeded) {
return gperr.New("docker client connection timeout")
return errors.New("docker client connection timeout")
}
if client.IsErrConnectionFailed(err) {
return gperr.New("docker client connection failure")
return errors.New("docker client connection failure")
}
return gperr.Wrap(err)
return err
}
func (w DockerWatcher) handleEvent(event dockerEvents.Message, ch chan<- Event) {

2
internal/watcher/events/README.md
View File

@@ -315,7 +315,7 @@ e.onFlush = func(events []Event) {
defer func() {
if errV := recover(); errV != nil {
if err, ok := errV.(error); ok {
e.onError(gperr.Wrap(err).Subject(e.task.Name()))
e.onError(gperr.PrependSubject(e.task.Name(), err))
} else {
e.onError(gperr.New("recovered panic in onFlush").Withf("%v", errV).Subject(e.task.Name()))
}

6
internal/watcher/events/event_queue.go
View File

@@ -19,7 +19,7 @@ type (
onError OnErrorFunc
}
OnFlushFunc = func(events []Event)
OnErrorFunc = func(err gperr.Error)
OnErrorFunc = func(err error)
)
const eventQueueCapacity = 10
@@ -50,14 +50,14 @@ func NewEventQueue(queueTask *task.Task, flushInterval time.Duration, onFlush On
}
}
func (e *EventQueue) Start(eventCh <-chan Event, errCh <-chan gperr.Error) {
func (e *EventQueue) Start(eventCh <-chan Event, errCh <-chan error) {
origOnFlush := e.onFlush
// recover panic in onFlush when in production mode
e.onFlush = func(events []Event) {
defer func() {
if errV := recover(); errV != nil {
if err, ok := errV.(error); ok {
e.onError(gperr.Wrap(err).Subject(e.task.Name()))
e.onError(gperr.PrependSubject(err, e.task.Name()))
} else {
e.onError(gperr.New("recovered panic in onFlush").Withf("%v", errV).Subject(e.task.Name()))
}

6
internal/watcher/file_watcher.go
View File

@@ -2,16 +2,14 @@ package watcher
import (
"context"
gperr "github.com/yusing/goutils/errs"
)
type fileWatcher struct {
relPath string
eventCh chan Event
errCh chan gperr.Error
errCh chan error
}
func (fw *fileWatcher) Events(ctx context.Context) (<-chan Event, <-chan gperr.Error) {
func (fw *fileWatcher) Events(ctx context.Context) (<-chan Event, <-chan error) {
return fw.eventCh, fw.errCh
}

3
internal/watcher/watcher.go
View File

@@ -4,11 +4,10 @@ import (
"context"
"github.com/yusing/godoxy/internal/watcher/events"
gperr "github.com/yusing/goutils/errs"
)
type Event = events.Event
type Watcher interface {
Events(ctx context.Context) (<-chan Event, <-chan gperr.Error)
Events(ctx context.Context) (<-chan Event, <-chan error)
}