heimoshuiyu/postmoogle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log level changes

Browse Source
This commit is contained in:
Aine
2023-01-04 11:22:50 +02:00
parent f54b87c1f7
commit 0559978fa2
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bot/email.go
View File

@@ -44,7 +44,7 @@ func (b *Bot) Sendmail(eventID id.EventID, from, to, data string) (bool, error)
err := b.sendmail(from, to, data) err := b.sendmail(from, to, data)
if err != nil { if err != nil {
if strings.HasPrefix(err.Error(), "4") { if strings.HasPrefix(err.Error(), "4") {
b.log.Debug("email %s (from=%s to=%s) was added to the queue: %v", eventID, from, to, err) b.log.Info("email %s (from=%s to=%s) was added to the queue: %v", eventID, from, to, err)
return true, b.q.Add(eventID.String(), from, to, data) return true, b.q.Add(eventID.String(), from, to, data)
} }
return false, err return false, err
@@ -179,7 +179,7 @@ func (b *Bot) SendEmailReply(ctx context.Context) {
meta.MessageID = email.MessageID(evt.ID, meta.FromDomain) meta.MessageID = email.MessageID(evt.ID, meta.FromDomain)
meta.References = meta.References + " " + meta.MessageID meta.References = meta.References + " " + meta.MessageID
b.log.Debug("send email reply: %+v", meta) b.log.Info("sending email reply: %+v", meta)
eml := email.New(meta.MessageID, meta.InReplyTo, meta.References, meta.Subject, meta.From, meta.To, meta.RcptTo, meta.CC, body, htmlBody, nil) eml := email.New(meta.MessageID, meta.InReplyTo, meta.References, meta.Subject, meta.From, meta.To, meta.RcptTo, meta.CC, body, htmlBody, nil)
data := eml.Compose(b.cfg.GetBot().DKIMPrivateKey()) data := eml.Compose(b.cfg.GetBot().DKIMPrivateKey())
if data == "" { if data == "" {

2
bot/queue/manager.go
View File

@@ -67,7 +67,7 @@ func (q *Queue) Process() {
return return
} }
if dequeue := q.try(itemkey, maxRetries); dequeue { if dequeue := q.try(itemkey, maxRetries); dequeue {
q.log.Debug("email %q has been delivered", id) q.log.Info("email %q has been delivered", id)
err = q.Remove(id) err = q.Remove(id)
if err != nil { if err != nil {
q.log.Error("cannot dequeue email %q: %v", id, err) q.log.Error("cannot dequeue email %q: %v", id, err)

4
bot/queue/queue.go
View File

@@ -85,11 +85,11 @@ func (q *Queue) try(itemkey string, maxRetries int) bool {
err = q.sendmail(item["from"], item["to"], item["data"]) err = q.sendmail(item["from"], item["to"], item["data"])
if err == nil { if err == nil {
q.log.Debug("email %q from queue was delivered") q.log.Info("email %q from queue was delivered")
return true return true
} }
q.log.Debug("attempted to deliver email id=%q, retry=%q, but it's not ready yet: %v", item["id"], item["attempts"], err) q.log.Info("attempted to deliver email id=%q, retry=%q, but it's not ready yet: %v", item["id"], item["attempts"], err)
attempts++ attempts++
item["attempts"] = strconv.Itoa(attempts) item["attempts"] = strconv.Itoa(attempts)
err = q.lp.SetAccountData(itemkey, item) err = q.lp.SetAccountData(itemkey, item)

2
smtp/listener.go
View File

@@ -42,7 +42,7 @@ func (l *Listener) Accept() (net.Conn, error) {
continue continue
} }
l.log.Debug("accepted connection from %q", conn.RemoteAddr()) l.log.Info("accepted connection from %q", conn.RemoteAddr())
return conn, nil return conn, nil
} }
} }

4
smtp/manager.go
View File

@@ -80,8 +80,8 @@ func NewManager(cfg *Config) *Manager {
if len(cfg.Domains) == 1 { if len(cfg.Domains) == 1 {
s.Domain = cfg.Domains[0] s.Domain = cfg.Domains[0]
} }
if log.GetLevel() == "DEBUG" || log.GetLevel() == "TRACE" { if log.GetLevel() == "INFO" || log.GetLevel() == "DEBUG" || log.GetLevel() == "TRACE" {
s.Debug = loggerWriter{func(s string) { log.Debug(s) }} s.Debug = loggerWriter{func(s string) { log.Info(s) }}
} }
m := &Manager{ m := &Manager{