diff --git a/bot/email.go b/bot/email.go index 57215f1..fcc732e 100644 --- a/bot/email.go +++ b/bot/email.go @@ -44,7 +44,7 @@ func (b *Bot) Sendmail(eventID id.EventID, from, to, data string) (bool, error) err := b.sendmail(from, to, data) if err != nil { 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 false, err @@ -179,7 +179,7 @@ func (b *Bot) SendEmailReply(ctx context.Context) { meta.MessageID = email.MessageID(evt.ID, meta.FromDomain) 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) data := eml.Compose(b.cfg.GetBot().DKIMPrivateKey()) if data == "" { diff --git a/bot/queue/manager.go b/bot/queue/manager.go index beb7923..dc2660f 100644 --- a/bot/queue/manager.go +++ b/bot/queue/manager.go @@ -67,7 +67,7 @@ func (q *Queue) Process() { return } 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) if err != nil { q.log.Error("cannot dequeue email %q: %v", id, err) diff --git a/bot/queue/queue.go b/bot/queue/queue.go index 077aa2e..71c74d2 100644 --- a/bot/queue/queue.go +++ b/bot/queue/queue.go @@ -85,11 +85,11 @@ func (q *Queue) try(itemkey string, maxRetries int) bool { err = q.sendmail(item["from"], item["to"], item["data"]) if err == nil { - q.log.Debug("email %q from queue was delivered") + q.log.Info("email %q from queue was delivered") 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++ item["attempts"] = strconv.Itoa(attempts) err = q.lp.SetAccountData(itemkey, item) diff --git a/smtp/listener.go b/smtp/listener.go index 7d3971e..8f158b9 100644 --- a/smtp/listener.go +++ b/smtp/listener.go @@ -42,7 +42,7 @@ func (l *Listener) Accept() (net.Conn, error) { continue } - l.log.Debug("accepted connection from %q", conn.RemoteAddr()) + l.log.Info("accepted connection from %q", conn.RemoteAddr()) return conn, nil } } diff --git a/smtp/manager.go b/smtp/manager.go index 62622df..c3185a5 100644 --- a/smtp/manager.go +++ b/smtp/manager.go @@ -80,8 +80,8 @@ func NewManager(cfg *Config) *Manager { if len(cfg.Domains) == 1 { s.Domain = cfg.Domains[0] } - if log.GetLevel() == "DEBUG" || log.GetLevel() == "TRACE" { - s.Debug = loggerWriter{func(s string) { log.Debug(s) }} + if log.GetLevel() == "INFO" || log.GetLevel() == "DEBUG" || log.GetLevel() == "TRACE" { + s.Debug = loggerWriter{func(s string) { log.Info(s) }} } m := &Manager{