diff options
Diffstat (limited to 'deliver_local.go')
| -rw-r--r-- | deliver_local.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/deliver_local.go b/deliver_local.go index 47af7f9..7e98aa6 100644 --- a/deliver_local.go +++ b/deliver_local.go @@ -2,16 +2,24 @@ package main import ( "context" + "errors" + "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" ) -func deliver_local(ctx context.Context, db *pgxpool.Pool, envelope_from string, envelope_recipients []string, data []byte, addresses []string) error { +func deliver_local(ctx context.Context, db *pgxpool.Pool, envelope_from string, envelope_recipients []string, data []byte, addresses []string) (err error) { tx, err := db.Begin(ctx) if err != nil { return err } - defer tx.Rollback(ctx) // BUG: Potential missed error here, but this will always fail if commit succeeded + defer func() { + err = tx.Rollback(ctx) + if errors.Is(err, pgx.ErrTxClosed) { + err = nil + return + } + }() for _, address := range addresses { _, err = tx.Exec(ctx, "INSERT INTO mail (mailbox_id, data) SELECT a.mailbox_id, $2::bytea FROM addresses a JOIN mailboxes m ON a.mailbox_id = m.id WHERE a.address = $1;", address, data) if err != nil { |