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(+), 6 deletions(-)

changed files
M internal/server/server.gointernal/server/server.go
@@ -2,6 +2,7 @@ package server
import ( "context" + "errors" "fmt" "net/http" "time"
@@ -9,7 +10,8 @@
"github.com/osdevisnot/sorvor/pkg/livereload" "go.alanpearce.eu/x/log" - "gitlab.com/tozd/go/errors" + "github.com/Southclaws/fault" + "github.com/Southclaws/fault/fmsg" ) var (
@@ -49,7 +51,7 @@ wrappedHandler.ServeHTTP(w, r)
}) } -func New(options *Options, log *log.Logger) (*Server, errors.E) { +func New(options *Options, log *log.Logger) (*Server, error) { return &Server{ mux: http.NewServeMux(), log: log,
@@ -57,9 +59,9 @@ options: options,
}, nil } -func (s *Server) HostApp(app *App) errors.E { +func (s *Server) HostApp(app *App) error { if app.Domain == "" { - return errors.New("app needs a domain") + return fault.New("app needs a domain") } s.options.Domains = append(s.options.Domains, app.Domain) s.mux.Handle(app.Domain+"/", app.Handler)
@@ -77,7 +79,7 @@ }
s.mux.Handle("/", app.Handler) } -func (s *Server) Start() errors.E { +func (s *Server) Start() error { var lh http.Handler if s.options.Development { lh = wrapHandlerWithLogging(s.mux, s.log)
@@ -110,7 +112,7 @@ Handler: top,
} if err := s.serveTCP(); !errors.Is(err, http.ErrServerClosed) { - return errors.WithMessage(err, "error creating/closing server") + return fault.Wrap(err, fmsg.With("error creating/closing server")) } return nil