all repos — homestead @ 4c07535d9120fb999b0c008f1866972865f424f7

Code for my website

replace tozd/errors with Southclaws/fault

Alan Pearce
commit

4c07535d9120fb999b0c008f1866972865f424f7

parent

90a4ac43b915abb7a2949f4b5313b40d705b6071

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

changed files
M internal/storage/sqlite/reader.go → internal/storage/sqlite/reader.go
@@ -5,7 +5,8 @@ "database/sql"
 	"strings"
 	"time"
 
-	"gitlab.com/tozd/go/errors"
+	"github.com/Southclaws/fault"
+	"github.com/Southclaws/fault/fmsg"
 	"go.alanpearce.eu/homestead/internal/buffer"
 	"go.alanpearce.eu/homestead/internal/storage"
 	"go.alanpearce.eu/x/log"

@@ -20,7 +21,7 @@ checkPath *sql.Stmt
 	}
 }
 
-func NewReader(db *sql.DB, log *log.Logger) (*Reader, errors.E) {
+func NewReader(db *sql.DB, log *log.Logger) (*Reader, error) {
 	r := &Reader{
 		log: log,
 		db:  db,

@@ -44,7 +45,7 @@ WHERE
 			url.path = ?
 	`)
 	if err != nil {
-		return nil, errors.WithMessage(err, "preparing select statement")
+		return nil, fault.Wrap(err, fmsg.With("preparing select statement"))
 	}
 
 	r.queries.checkPath, err = r.db.Prepare(`

@@ -55,13 +56,13 @@ WHERE path = ?
 		) AS differs
 `)
 	if err != nil {
-		return nil, errors.WithMessage(err, "preparing check path statement")
+		return nil, fault.Wrap(err, fmsg.With("preparing check path statement"))
 	}
 
 	return r, nil
 }
 
-func (r *Reader) GetFile(filename string) (*storage.File, errors.E) {
+func (r *Reader) GetFile(filename string) (*storage.File, error) {
 	file := &storage.File{
 		Encodings: make(map[string]*buffer.Buffer, 1),
 	}

@@ -72,7 +73,7 @@
 	r.log.Debug("querying db for file", "filename", filename)
 	rows, err := r.queries.getFile.Query(filename)
 	if err != nil {
-		return nil, errors.WithMessage(err, "querying database")
+		return nil, fault.Wrap(err, fmsg.With("querying database"))
 	}
 	defer rows.Close()
 

@@ -89,7 +90,7 @@ &encoding,
 			&content,
 		)
 		if err != nil {
-			return nil, errors.WithMessage(err, "querying database")
+			return nil, fault.Wrap(err, fmsg.With("querying database"))
 		}
 
 		file.LastModified = time.Unix(unixTime, 0)

@@ -99,7 +100,7 @@ if count == 0 {
 		return nil, nil
 	}
 	if err := rows.Err(); err != nil {
-		return nil, errors.WithMessage(err, "error iterating rows")
+		return nil, fault.Wrap(err, fmsg.With("error iterating rows"))
 	}
 
 	return file, nil