From f7b58c87b1887cac1bf9469a2198736ce519c52b Mon Sep 17 00:00:00 2001 From: Mechiel Lukkien Date: Sat, 7 Dec 2024 19:06:16 +0100 Subject: [PATCH] instead of using loglevel error for printing a warning, just log it as "warn" error level, and don't log message parsing errors as loglevel error --- autotls/autotls.go | 4 ++-- mox-/config.go | 2 +- store/train.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autotls/autotls.go b/autotls/autotls.go index 4bbc229..fa42ad6 100644 --- a/autotls/autotls.go +++ b/autotls/autotls.go @@ -312,12 +312,12 @@ func (m *Manager) SetAllowedHostnames(log mlog.Log, resolver dns.Resolver, hostn for _, h := range added { ips, _, err := resolver.LookupIP(ctx, "ip", h.ASCII+".") if err != nil { - log.Errorx("warning: acme tls cert validation for host may fail due to dns lookup error", err, slog.Any("host", h)) + log.Warnx("acme tls cert validation for host may fail due to dns lookup error", err, slog.Any("host", h)) continue } for _, ip := range ips { if _, ok := publicIPstrs[ip.String()]; !ok { - log.Error("warning: acme tls cert validation for host is likely to fail because not all its ips are being listened on", + log.Warn("acme tls cert validation for host is likely to fail because not all its ips are being listened on", slog.Any("hostname", h), slog.Any("listenedips", publicIPs), slog.Any("hostips", ips), diff --git a/mox-/config.go b/mox-/config.go index 826aa16..34c033d 100644 --- a/mox-/config.go +++ b/mox-/config.go @@ -783,7 +783,7 @@ func PrepareStaticConfig(ctx context.Context, log mlog.Log, configFile string, c } } if l.TLS.ACME != "" && (len(l.TLS.HostPrivateRSA2048Keys) == 0) != (len(l.TLS.HostPrivateECDSAP256Keys) == 0) { - log.Error("warning: uncommon configuration with either only an RSA 2048 or ECDSA P256 host private key for DANE/ACME certificates; this ACME implementation can retrieve certificates for both type of keys, it is recommended to set either both or none; continuing") + log.Warn("uncommon configuration with either only an RSA 2048 or ECDSA P256 host private key for DANE/ACME certificates; this ACME implementation can retrieve certificates for both type of keys, it is recommended to set either both or none; continuing") } // TLS 1.2 was introduced in 2008. TLS <1.2 was deprecated by ../rfc/8996:31 and ../rfc/8997:66 in 2021. diff --git a/store/train.go b/store/train.go index 48cb5b3..8064e92 100644 --- a/store/train.go +++ b/store/train.go @@ -117,7 +117,7 @@ func (a *Account) RetrainMessage(ctx context.Context, log mlog.Log, tx *bstore.T words, err := jf.ParseMessage(p) if err != nil { - log.Errorx("parsing message for updating junk filter", err, slog.Any("parse", "")) + log.Infox("parsing message for updating junk filter", err, slog.Any("parse", "")) return nil } @@ -162,7 +162,7 @@ func (a *Account) TrainMessage(ctx context.Context, log mlog.Log, jf *junk.Filte words, err := jf.ParseMessage(p) if err != nil { - log.Errorx("parsing message for updating junk filter", err, slog.Any("parse", "")) + log.Infox("parsing message for updating junk filter", err, slog.Any("parse", "")) return false, nil }