mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-06 14:37:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

storage/sql: Report serialiation failures as temporary SMTP errors

Browse source 
To make it actually happen instead of hanging forever, go-imap-sql's
naive default for SQLite3's PRAGMA busy_timeout is changed to 5000ms.

Closes #146.
This commit is contained in:
fox.cpp 2020-02-16 01:11:40 +03:00
parent 44c640be48
commit 97926c0131
No known key found for this signature in database
GPG key ID: E76D97CCEDE90B6C
3 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
internal/storage/sql/sql.go
View file

@ -103,6 +103,15 @@ func (d *delivery) AddRcpt(ctx context.Context, rcptTo string) error {
Err: err,
}
}
if _, ok := err.(imapsql.SerializationError); ok {
return &exterrors.SMTPError{
Code: 453,
EnhancedCode: exterrors.EnhancedCode{4, 3, 2},
Message: "Storage access serialiation problem, try again later",
TargetName: "sql",
Err: err,
}
}
return err
}
@ -115,13 +124,34 @@ func (d *delivery) Body(ctx context.Context, header textproto.Header, body buffe
if d.msgMeta.Quarantine {
if err := d.d.SpecialMailbox(specialuse.Junk, d.store.junkMbox); err != nil {
if _, ok := err.(imapsql.SerializationError); ok {
return &exterrors.SMTPError{
Code: 453,
EnhancedCode: exterrors.EnhancedCode{4, 3, 2},
Message: "Storage access serialiation problem, try again later",
TargetName: "sql",
Err: err,
}
}
return err
}
}
header = header.Copy()
header.Add("Return-Path", "<"+target.SanitizeForHeader(d.mailFrom)+">")
return d.d.BodyParsed(header, body.Len(), body)
err := d.d.BodyParsed(header, body.Len(), body)
if err != nil {
if _, ok := err.(imapsql.SerializationError); ok {
return &exterrors.SMTPError{
Code: 453,
EnhancedCode: exterrors.EnhancedCode{4, 3, 2},
Message: "Storage access serialiation problem, try again later",
TargetName: "sql",
Err: err,
}
}
}
return nil
}
func (d *delivery) Abort(ctx context.Context) error {
@ -201,7 +231,7 @@ func (store *Storage) Init(cfg *config.Map) error {
cfg.DataSize("appendlimit", false, false, 32*1024*1024, &appendlimitVal)
cfg.Bool("debug", true, false, &store.Log.Debug)
cfg.Int("sqlite3_cache_size", false, false, 0, &opts.CacheSize)
cfg.Int("sqlite3_busy_timeout", false, false, 0, &opts.BusyTimeout)
cfg.Int("sqlite3_busy_timeout", false, false, 5000, &opts.BusyTimeout)
cfg.Bool("sqlite3_exclusive_lock", false, false, &opts.ExclusiveLock)
cfg.String("junk_mailbox", false, false, "Junk", &store.junkMbox)