infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-12 12:24:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

consistently use log.Check for logging errors that "should not happen", don't influence application flow

Browse Source 
sooner or later, someone will notice one of these messages, which will lead us
to a bug.
This commit is contained in:
Mechiel Lukkien
2023-02-16 13:22:00 +01:00
parent ef8e5fa1a8
commit 5c33640aea
30 changed files with 366 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mox-/admin.go
View File

@ -148,9 +148,8 @@ func MakeDomainConfig(ctx context.Context, domain, hostname dns.Domain, accountN
var paths []string
defer func() {
for _, p := range paths {
if err := os.Remove(p); err != nil {
log.Errorx("removing path for domain config", err, mlog.Field("path", p))
}
err := os.Remove(p)
log.Check(err, "removing path for domain config", mlog.Field("path", p))
}
}()
@ -163,8 +162,10 @@ func MakeDomainConfig(ctx context.Context, domain, hostname dns.Domain, accountN
}
defer func() {
if f != nil {
os.Remove(path)
f.Close()
err := os.Remove(path)
log.Check(err, "removing file after error")
err = f.Close()
log.Check(err, "closing file after error")
}
}()
if _, err := f.Write(data); err != nil {
@ -298,9 +299,8 @@ func DomainAdd(ctx context.Context, domain dns.Domain, accountName string, local
}
defer func() {
for _, f := range cleanupFiles {
if err := os.Remove(f); err != nil {
log.Errorx("cleaning up file after error", err, mlog.Field("path", f))
}
err := os.Remove(f)
log.Check(err, "cleaning up file after error", mlog.Field("path", f))
}
}()
@ -316,7 +316,7 @@ func DomainAdd(ctx context.Context, domain dns.Domain, accountName string, local
nc.Domains[domain.Name()] = confDomain
if err := writeDynamic(ctx, nc); err != nil {
if err := writeDynamic(ctx, log, nc); err != nil {
return fmt.Errorf("writing domains.conf: %v", err)
}
log.Info("domain added", mlog.Field("domain", domain))
@ -355,7 +355,7 @@ func DomainRemove(ctx context.Context, domain dns.Domain) (rerr error) {
}
}
if err := writeDynamic(ctx, nc); err != nil {
if err := writeDynamic(ctx, log, nc); err != nil {
return fmt.Errorf("writing domains.conf: %v", err)
}
@ -548,7 +548,7 @@ func AccountAdd(ctx context.Context, account, address string) (rerr error) {
}
nc.Accounts[account] = MakeAccountConfig(addr)
if err := writeDynamic(ctx, nc); err != nil {
if err := writeDynamic(ctx, log, nc); err != nil {
return fmt.Errorf("writing domains.conf: %v", err)
}
log.Info("account added", mlog.Field("account", account), mlog.Field("address", addr))
@ -582,7 +582,7 @@ func AccountRemove(ctx context.Context, account string) (rerr error) {
}
}
if err := writeDynamic(ctx, nc); err != nil {
if err := writeDynamic(ctx, log, nc); err != nil {
return fmt.Errorf("writing domains.conf: %v", err)
}
log.Info("account removed", mlog.Field("account", account))
@ -642,7 +642,7 @@ func AddressAdd(ctx context.Context, address, account string) (rerr error) {
a.Destinations = nd
nc.Accounts[account] = a
if err := writeDynamic(ctx, nc); err != nil {
if err := writeDynamic(ctx, log, nc); err != nil {
return fmt.Errorf("writing domains.conf: %v", err)
}
log.Info("address added", mlog.Field("address", addr), mlog.Field("account", account))
@ -699,7 +699,7 @@ func AddressRemove(ctx context.Context, address string) (rerr error) {
}
nc.Accounts[ad.Account] = na
if err := writeDynamic(ctx, nc); err != nil {
if err := writeDynamic(ctx, log, nc); err != nil {
return fmt.Errorf("writing domains.conf: %v", err)
}
log.Info("address removed", mlog.Field("address", addr), mlog.Field("account", ad.Account))
@ -744,7 +744,7 @@ func DestinationSave(ctx context.Context, account, destName string, newDest conf
nacc.Destinations = nd
nc.Accounts[account] = nacc
if err := writeDynamic(ctx, nc); err != nil {
if err := writeDynamic(ctx, log, nc); err != nil {
return fmt.Errorf("writing domains.conf: %v", err)
}
log.Info("destination saved", mlog.Field("account", account), mlog.Field("destname", destName))