feat(logging); improve messages and errors (#336)

* feat(logger): add module context

* feat(logger): change errors package

* feat(logger): update tests
This commit is contained in:
Ludvig Lundgren 2022-07-05 13:31:44 +02:00 committed by GitHub
parent 95471a4cf7
commit 0e88117702
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 1172 additions and 957 deletions

View file

@ -2,8 +2,8 @@ package database
import (
"database/sql"
"errors"
"fmt"
"github.com/autobrr/autobrr/pkg/errors"
_ "github.com/lib/pq"
)
@ -14,19 +14,19 @@ func (db *DB) openPostgres() error {
// open database connection
if db.handler, err = sql.Open("postgres", db.DSN); err != nil {
db.log.Fatal().Err(err).Msg("could not open postgres connection")
return err
return errors.Wrap(err, "could not open postgres connection")
}
err = db.handler.Ping()
if err != nil {
db.log.Fatal().Err(err).Msg("could not ping postgres database")
return err
return errors.Wrap(err, "could not ping postgres database")
}
// migrate db
if err = db.migratePostgres(); err != nil {
db.log.Fatal().Err(err).Msg("could not migrate postgres database")
return err
return errors.Wrap(err, "could not migrate postgres database")
}
return nil
@ -35,7 +35,7 @@ func (db *DB) openPostgres() error {
func (db *DB) migratePostgres() error {
tx, err := db.handler.Begin()
if err != nil {
return err
return errors.Wrap(err, "error starting transaction")
}
defer tx.Rollback()
@ -45,37 +45,37 @@ func (db *DB) migratePostgres() error {
);`
if _, err := tx.Exec(initialSchema); err != nil {
return fmt.Errorf("failed to create schema_migrations table: %s", err)
return errors.New("failed to create schema_migrations table")
}
var version int
err = tx.QueryRow(`SELECT version FROM schema_migrations`).Scan(&version)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
return err
return errors.Wrap(err, "no rows")
}
if version == len(postgresMigrations) {
return nil
}
if version > len(postgresMigrations) {
return fmt.Errorf("old")
return errors.New("old")
}
if version == 0 {
if _, err := tx.Exec(postgresSchema); err != nil {
return fmt.Errorf("failed to initialize schema: %v", err)
return errors.Wrap(err, "failed to initialize schema")
}
} else {
for i := version; i < len(postgresMigrations); i++ {
if _, err := tx.Exec(postgresMigrations[i]); err != nil {
return fmt.Errorf("failed to execute migration #%v: %v", i, err)
return errors.Wrap(err, "failed to execute migration #%v", i)
}
}
}
_, err = tx.Exec(`INSERT INTO schema_migrations (id, version) VALUES (1, $1) ON CONFLICT (id) DO UPDATE SET version = $1`, len(postgresMigrations))
if err != nil {
return fmt.Errorf("failed to bump schema version: %v", err)
return errors.Wrap(err, "failed to bump schema version")
}
return tx.Commit()