Convert some TODOs to log statements.

diff --git a/pop3.go b/pop3.go
index 20f94bf6a36cfb5c6c618a242962757c89eb9230..a03c1b81c181a0965e11c00780ed9294392ac52d 100644 (file)
--- a/pop3.go
+++ b/pop3.go
@@ -114,8 +114,8 @@ func (server *pop3Server) OpenMailbox(user, pass string) (pop3.Mailbox, error) {
 func (server *pop3Server) openMailbox(maildrop string) (*mailbox, error) {
        files, err := ioutil.ReadDir(maildrop)
        if err != nil {
-               // TODO: hide error, log instead
-               return nil, err
+               server.log.Error("failed read maildrop dir", zap.String("dir", maildrop), zap.Error(err))
+               return nil, errors.New("error opening maildrop")
        }
 
        mb := &mailbox{

diff --git a/smtp.go b/smtp.go
index 55484a2a06199d847749c11a3835725a6966fdc7..90f0ec535a01a9f7cdf9ceb206f8f05017e0238e 100644 (file)
--- a/smtp.go
+++ b/smtp.go
@@ -128,13 +128,13 @@ func (server *smtpServer) Authenticate(authz, authc, passwd string) bool {
 func (server *smtpServer) DeliverMessage(en smtp.Envelope) *smtp.ReplyLine {
        maildrop := server.maildropForAddress(en.RcptTo[0])
        if maildrop == "" {
-               // TODO: log error
+               server.log.Error("faild to open maildrop to deliver message", zap.String("id", en.ID))
                return &smtp.ReplyBadMailbox
        }
 
        f, err := os.Create(path.Join(maildrop, en.ID+".msg"))
        if err != nil {
-               // TODO: log error
+               server.log.Error("failed to create message file", zap.String("id", en.ID), zap.Error(err))
                return &smtp.ReplyBadMailbox
        }