Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Consistently log internal errors

Browse source
This commit is contained in:
Eli Ribble 2026-02-09 22:43:32 +00:00
parent 13c5529a41
commit b9cf98eee8
No known key found for this signature in database
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
platform/report/error_with_code.go
View file

@ -2,6 +2,8 @@ package report
import (
"fmt"
"github.com/rs/zerolog/log"
)
type ErrorWithCode struct {
@ -17,6 +19,10 @@ func (e *ErrorWithCode) Error() string {
return e.message
}
func newInternalError(err error, format string, args ...any) *ErrorWithCode {
log.Error().Err(err).Str("format", format).Msg("internal server error")
return newErrorWithCode("internal-error", format, args...)
}
func newErrorWithCode(code string, format string, args ...any) *ErrorWithCode {
if len(args) > 0 {
return &ErrorWithCode{

12
platform/report/report_nuisance.go
View file

@ -42,7 +42,7 @@ func (sr Nuisance) addNotificationEmail(ctx context.Context, txn bob.Tx, email s
}
_, err := models.PublicreportNotifyPhoneNuisances.Insert(&setter).Exec(ctx, txn)
if err != nil {
return newErrorWithCode("internal-error", "Failed to save new notification email row")
return newInternalError(err, "Failed to save new notification email row")
}
return nil
}
@ -56,7 +56,7 @@ func (sr Nuisance) addNotificationPhone(ctx context.Context, txn bob.Tx, phone t
}
_, err = models.PublicreportNotifyPhoneNuisances.Insert(&setter).Exec(ctx, txn)
if err != nil {
return newErrorWithCode("internal-error", "Failed to save new notification phone row")
return newInternalError(err, "Failed to save new notification phone row")
}
return nil
}
@ -87,7 +87,7 @@ func (sr Nuisance) updateReportCol(ctx context.Context, txn bob.Tx, setter *mode
err := sr.row.Update(ctx, txn, setter)
if err != nil {
log.Error().Err(err).Str("public_id", sr.publicReportID).Int32("report_id", sr.id).Msg("Failed to update report")
return newErrorWithCode("internal-error", "Failed to update nuisance report in the database")
return newInternalError(err, "Failed to update nuisance report in the database")
}
return nil
}
@ -108,11 +108,11 @@ func (sr Nuisance) updateReporterPhone(ctx context.Context, txn bob.Tx, phone te
um.Where(psql.Quote("public_id").EQ(psql.Arg(sr.publicReportID))),
).Exec(ctx, txn)
if err != nil {
return newErrorWithCode("internal-error", "Failed to update report: %w", err)
return newInternalError(err, "Failed to update report: %w", err)
}
rowcount, err := result.RowsAffected()
if err != nil {
return newErrorWithCode("internal-error", "Failed to get rows affected: %w", err)
return newInternalError(err, "Failed to get rows affected: %w", err)
}
if rowcount != 1 {
log.Warn().Str("public_report_id", sr.publicReportID).Msg("updated more than one row, which is a programmer error")
@ -123,7 +123,7 @@ func (sr Nuisance) updateReporterPhone(ctx context.Context, txn bob.Tx, phone te
func newNuisance(ctx context.Context, public_id string, report_id int32) (Nuisance, *ErrorWithCode) {
row, err := models.FindPublicreportNuisance(ctx, db.PGInstance.BobDB, report_id)
if err != nil {
return Nuisance{}, newErrorWithCode("internal-error", "Failed to find nuisance report %d: %w", public_id, err)
return Nuisance{}, newInternalError(err, "Failed to find nuisance report %d: %w", public_id, err)
}
return Nuisance{
id: report_id,

8
platform/report/report_pool.go
View file

@ -40,7 +40,7 @@ func (sr Pool) addNotificationEmail(ctx context.Context, txn bob.Tx, email strin
_, err := models.PublicreportNotifyEmailPools.Insert(&setter).Exec(ctx, txn)
if err != nil {
log.Error().Err(err).Msg("Failed to save new notification email row")
return newErrorWithCode("internal-error", "Failed to save new notification email row")
return newInternalError(err, "Failed to save new notification email row")
}
return nil
}
@ -54,7 +54,7 @@ func (sr Pool) addNotificationPhone(ctx context.Context, txn bob.Tx, phone text.
_, err := models.PublicreportNotifyPhonePools.Insert(&setter).Exec(ctx, txn)
if err != nil {
log.Error().Err(err).Msg("Failed to save new notification phone row")
return newErrorWithCode("internal-error", "Failed to save new notification phone row")
return newInternalError(err, "Failed to save new notification phone row")
}
return nil
}
@ -96,7 +96,7 @@ func (sr Pool) updateReportCol(ctx context.Context, txn bob.Tx, setter *models.P
err := sr.row.Update(ctx, txn, setter)
if err != nil {
log.Error().Err(err).Str("public_id", sr.publicReportID).Int32("report_id", sr.id).Msg("Failed to update report")
return newErrorWithCode("internal-error", "Failed to update pool report in the database")
return newInternalError(err, "Failed to update pool report in the database")
}
return nil
}
@ -109,7 +109,7 @@ func newPool(ctx context.Context, public_id string, report_id int32) (Pool, *Err
row, err := models.FindPublicreportPool(ctx, db.PGInstance.BobDB, report_id)
if err != nil {
log.Error().Err(err).Msg("Failed to find pool report")
return Pool{}, newErrorWithCode("internal-error", "Failed to find pool report %d: %w", public_id, err)
return Pool{}, newInternalError(err, "Failed to find pool report %d: %w", public_id, err)
}
return Pool{
id: report_id,