refactor: use new functions from go 1.25
3 files changed, 7 insertions(+), 64 deletions(-)
M cmd/searchix-web/serve.go → cmd/searchix-web/serve.go
@@ -79,8 +79,7 @@ ctx, stop := signal.NotifyContext(context.Background(), signals...) defer stop() wg := &sync.WaitGroup{} - wg.Add(1) - go func() { + wg.Go(func() { sCtx, cancel := context.WithCancel(ctx) defer cancel() defer wg.Done()@@ -89,7 +88,7 @@ if err != nil && !errors.Is(err, context.Canceled) { // Error starting or closing listener: logger.Fatal("error", "error", err) } - }() + }) err = sdnotify.Ready() if err != nil {@@ -137,11 +136,9 @@ } }() signal.Notify(reimport, syscall.SIGUSR1, syscall.SIGUSR2) - wg.Add(1) - go func() { - defer wg.Done() + wg.Go(func() { imp.StartUpdateTimer(ctx) - }() + }) if wdu, defined := os.LookupEnv("WATCHDOG_USEC"); defined { wd, err := time.ParseDuration(wdu + "us")@@ -150,16 +147,14 @@ logger.Fatal("could not parse WATCHDOG_USEC", "value", wdu) } tickRate := time.Duration(math.Ceil(wd.Seconds()*0.75)) * time.Second - wg.Add(1) - go func() { - defer wg.Done() + wg.Go(func() { for range time.Tick(tickRate) { err := sdnotify.Watchdog() if err != nil { logger.Warn("") } } - }() + }) } <-ctx.Done()
M internal/fetcher/main.go → internal/fetcher/main.go
@@ -40,7 +40,7 @@ return nil, fault.Wrap(err, fmsg.With("failed to check if directory exists")) } if !exists { - err = opts.Root.MkdirAll(target) + err = opts.Root.MkdirAll(target, 0o750) if err != nil { return nil, fault.Wrap(err, fmsg.With("failed to create directory")) }
M internal/file/root.go → internal/file/root.go
@@ -6,7 +6,6 @@ "io" "io/fs" "os" "path/filepath" - "time" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg"@@ -82,54 +81,3 @@ } return nil } - -func (r *Root) Chtimes(name string, atime time.Time, mtime time.Time) error { - err := os.Chtimes(r.JoinPath(name), atime, mtime) - if err != nil { - return fault.Wrap(err, fmsg.Withf("failed to change times of %s", name)) - } - - return nil -} - -func (r *Root) MkdirAll(name string) error { - err := os.MkdirAll(r.JoinPath(name), 0o750) - if err != nil { - return fault.Wrap(err, fmsg.Withf("failed to create directory %s", name)) - } - - return nil -} - -func (r *Root) ReadFile(name string) ([]byte, error) { - b, err := fs.ReadFile(r.FS(), name) - if err != nil { - return nil, fault.Wrap(err, fmsg.Withf("failed to read file %s", name)) - } - - return b, nil -} - -func (r *Root) WriteFile(name string, data []byte, perm fs.FileMode) error { - f, err := r.OpenFile(name, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, perm) - if err != nil { - return fault.Wrap(err, fmsg.Withf("failed to write file %s", name)) - } - defer f.Close() - - _, err = f.Write(data) - if err != nil { - return fault.Wrap(err, fmsg.Withf("failed to write file %s", name)) - } - - return nil -} - -func (r *Root) RemoveAll(name string) error { - err := os.RemoveAll(r.JoinPath(name)) - if err != nil { - return fault.Wrap(err, fmsg.Withf("failed to remove path %s", r.JoinPath(name))) - } - - return nil -}