Rename smtp.Server.OnMessageDelievered to DeliverMessage.

diff --git a/smtp.go b/smtp.go
index 2a27279b636aacc068139be322790ffda3410128..55484a2a06199d847749c11a3835725a6966fdc7 100644 (file)
--- a/smtp.go
+++ b/smtp.go
@@ -125,7 +125,7 @@ func (server *smtpServer) Authenticate(authz, authc, passwd string) bool {
        return false
 }
 
-func (server *smtpServer) OnMessageDelivered(en smtp.Envelope) *smtp.ReplyLine {
+func (server *smtpServer) DeliverMessage(en smtp.Envelope) *smtp.ReplyLine {
        maildrop := server.maildropForAddress(en.RcptTo[0])
        if maildrop == "" {
                // TODO: log error

diff --git a/smtp/conn.go b/smtp/conn.go
index 9020073086237127febeddcce57375aa1814f009..809394563f9fa1f5cb1a459af838c44344453eca 100644 (file)
--- a/smtp/conn.go
+++ b/smtp/conn.go
@@ -428,7 +428,7 @@ func (conn *connection) doDATA() {
        env.Data = append(trace, env.Data...)
 
        if conn.delivery == deliverInbound {
-               if reply := conn.server.OnMessageDelivered(env); reply != nil {
+               if reply := conn.server.DeliverMessage(env); reply != nil {
                        conn.log.Warn("message was rejected", zap.String("id", env.ID))
                        conn.reply(*reply)
                        return

diff --git a/smtp/relay.go b/smtp/relay.go
index 713eee9806766d81da94e7b9797e9740ee8fa20f..5d65d84d415a83af635abbe80e438a286ebe5cb7 100644 (file)
--- a/smtp/relay.go
+++ b/smtp/relay.go
@@ -153,5 +153,5 @@ func deliverRelayFailure(server Server, env Envelope, log *zap.Logger, to, error
        mw.Close()
 
        failure.Data = buf.Bytes()
-       server.OnMessageDelivered(failure)
+       server.DeliverMessage(failure)
 }

diff --git a/smtp/relay_test.go b/smtp/relay_test.go
index 175eea56326c59f96406145b88843afed8f68add..6ad6a08483e31696e18ffec3eea185e705190050 100644 (file)
--- a/smtp/relay_test.go
+++ b/smtp/relay_test.go
@@ -25,7 +25,7 @@ type deliveryServer struct {
        messages []Envelope
 }
 
-func (s *deliveryServer) OnMessageDelivered(env Envelope) *ReplyLine {
+func (s *deliveryServer) DeliverMessage(env Envelope) *ReplyLine {
        s.messages = append(s.messages, env)
        return nil
 }

diff --git a/smtp/server.go b/smtp/server.go
index b991a227e502e8bbf576419b42dad930d4a1a823..8697eb1a52f254bd4e5085faa012b57b4ddefdeb 100644 (file)
--- a/smtp/server.go
+++ b/smtp/server.go
@@ -94,7 +94,7 @@ type Server interface {
        VerifyAddress(mail.Address) ReplyLine
        // Verify that the authc+passwd identity can send mail as authz.
        Authenticate(authz, authc, passwd string) bool
-       OnMessageDelivered(Envelope) *ReplyLine
+       DeliverMessage(Envelope) *ReplyLine
 
        // RelayMessage instructs the server to send the Envelope to another
        // MTA for outbound delivery.
@@ -115,7 +115,7 @@ func (*EmptyServerCallbacks) Authenticate(authz, authc, passwd string) bool {
        return false
 }
 
-func (*EmptyServerCallbacks) OnMessageDelivered(Envelope) *ReplyLine {
+func (*EmptyServerCallbacks) DeliverMessage(Envelope) *ReplyLine {
        return nil
 }
 

diff --git a/smtp_test.go b/smtp_test.go
index d1239ea99a3bce649d6f04abdfef2f98ed7939c0..40d0dca7c2087da6bde04d0e1c4bcac4fbe83ba4 100644 (file)
--- a/smtp_test.go
+++ b/smtp_test.go
@@ -85,7 +85,7 @@ func TestMessageDelivery(t *testing.T) {
                ID:       "msgid",
        }
 
-       if rl := s.OnMessageDelivered(env); rl != nil {
+       if rl := s.DeliverMessage(env); rl != nil {
                t.Errorf("Failed to deliver message: %v", rl)
        }