all repos — homestead @ 4c07535d9120fb999b0c008f1866972865f424f7

Code for my website

replace tozd/errors with Southclaws/fault

Alan Pearce
commit

4c07535d9120fb999b0c008f1866972865f424f7

parent

90a4ac43b915abb7a2949f4b5313b40d705b6071

1 file changed, 8 insertions(+), 7 deletions(-)

changed files
M internal/website/website.gointernal/website/website.go
@@ -9,7 +9,8 @@ "slices"
"sync" "time" - "gitlab.com/tozd/go/errors" + "github.com/Southclaws/fault" + "github.com/Southclaws/fault/fmsg" "go.alanpearce.eu/homestead/internal/calendar" "go.alanpearce.eu/homestead/internal/config" "go.alanpearce.eu/homestead/internal/events"
@@ -77,7 +78,7 @@
func New( opts *Options, log *log.Logger, -) (*Website, errors.E) { +) (*Website, error) { website := &Website{ log: log, App: &server.App{
@@ -87,7 +88,7 @@ }
err := prepareRootDirectory(opts.Root) if err != nil { - return nil, errors.WithMessage(err, "could not prepare root directory") + return nil, fault.Wrap(err, fmsg.With("could not prepare root directory")) } var listener events.Listener
@@ -99,7 +100,7 @@ log.Debug("using file watcher")
listener, err = events.NewFileWatcher(log.Named("events"), "website") } if err != nil { - return nil, errors.WithMessage(err, "could not create update listener") + return nil, fault.Wrap(err, fmsg.With("could not create update listener")) } var cfg *config.Config
@@ -111,7 +112,7 @@ Listener: listener,
}) roots, err := fetcher.Subscribe() if err != nil { - return nil, errors.WithMessage(err, "could not set up fetcher") + return nil, fault.Wrap(err, fmsg.With("could not set up fetcher")) } if opts.Development {
@@ -217,11 +218,11 @@
return website, nil } -func prepareRootDirectory(root string) errors.E { +func prepareRootDirectory(root string) error { if !file.Exists(root) { err := os.MkdirAll(root, 0o750) if err != nil { - return errors.WithMessage(err, "could not create root directory") + return fault.Wrap(err, fmsg.With("could not create root directory")) } }