Updates for the latest zap.

diff --git a/smtp/relay.go b/smtp/relay.go
index f709ce18b8f0122ccf89120aaed20b4b8bfd8f82..dc26f191bd9f65427191bd196b217ce6add0df84 100644 (file)
--- a/smtp/relay.go
+++ b/smtp/relay.go
@@ -11,10 +11,10 @@ import (
        "net"
        "net/smtp"
 
-       "github.com/uber-go/zap"
+       "go.uber.org/zap"
 )
 
-func RelayMessage(server Server, env Envelope, log zap.Logger) {
+func RelayMessage(server Server, env Envelope, log *zap.Logger) {
        for _, rcptTo := range env.RcptTo {
                sendLog := log.With(zap.String("address", rcptTo.Address))
 
@@ -31,7 +31,7 @@ func RelayMessage(server Server, env Envelope, log zap.Logger) {
        }
 }
 
-func relayMessageToHost(server Server, env Envelope, log zap.Logger, to, host string) {
+func relayMessageToHost(server Server, env Envelope, log *zap.Logger, to, host string) {
        from := env.MailFrom.Address
 
        c, err := smtp.Dial(host)

diff --git a/smtp/relay_test.go b/smtp/relay_test.go
index bfd3724d34277afa209f0e767fa140342ca1a8a9..31d0d2231cf761fdb5363f3806859f31a246e71f 100644 (file)
--- a/smtp/relay_test.go
+++ b/smtp/relay_test.go
@@ -11,7 +11,7 @@ import (
        "net/mail"
        "testing"
 
-       "github.com/uber-go/zap"
+       "go.uber.org/zap"
 )
 
 type deliveryServer struct {
@@ -38,7 +38,7 @@ func TestRelayRoundTrip(t *testing.T) {
                ID:       "ididid",
        }
 
-       relayMessageToHost(s, env, zap.New(zap.NullEncoder()), env.RcptTo[0].Address, l.Addr().String())
+       relayMessageToHost(s, env, zap.NewNop(), env.RcptTo[0].Address, l.Addr().String())
 
        if len(s.messages) != 1 {
                t.Errorf("Expected 1 message to be delivered, got %d", len(s.messages))