mirror of
https://github.com/yusing/godoxy.git
synced 2026-02-19 07:17:57 +01:00
6da7227f9b
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.
66 lines
1.3 KiB
Go
66 lines
1.3 KiB
Go
package idlewatcher
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
)
|
|
|
|
type watcherError struct {
|
|
watcher *Watcher
|
|
err error
|
|
}
|
|
|
|
func (e *watcherError) Unwrap() error {
|
|
return e.err
|
|
}
|
|
|
|
func (e *watcherError) Error() string {
|
|
return fmt.Sprintf("watcher %q error: %s", e.watcher.cfg.ContainerName(), e.err.Error())
|
|
}
|
|
|
|
func (w *Watcher) newWatcherError(err error) error {
|
|
if errors.Is(err, errCauseReload) {
|
|
return nil
|
|
}
|
|
if wErr, ok := err.(*watcherError); ok { //nolint:errorlint
|
|
return wErr
|
|
}
|
|
return &watcherError{watcher: w, err: convertError(err)}
|
|
}
|
|
|
|
type depError struct {
|
|
action string
|
|
dep *dependency
|
|
err error
|
|
}
|
|
|
|
func (e *depError) Unwrap() error {
|
|
return e.err
|
|
}
|
|
|
|
func (e *depError) Error() string {
|
|
return fmt.Sprintf("%s failed for dependency %q: %s", e.action, e.dep.cfg.ContainerName(), e.err.Error())
|
|
}
|
|
|
|
func (w *Watcher) newDepError(action string, dep *dependency, err error) error {
|
|
if errors.Is(err, errCauseReload) {
|
|
return nil
|
|
}
|
|
if dErr, ok := err.(*depError); ok { //nolint:errorlint
|
|
return dErr
|
|
}
|
|
return &depError{action: action, dep: dep, err: convertError(err)}
|
|
}
|
|
|
|
func convertError(err error) error {
|
|
switch {
|
|
case err == nil:
|
|
return nil
|
|
case errors.Is(err, context.DeadlineExceeded):
|
|
return errors.New("timeout")
|
|
default:
|
|
return err
|
|
}
|
|
}
|