From cb72072f8d6e0501c81cdec99d09e0c1be63c796 Mon Sep 17 00:00:00 2001
From: Justin Reagor <justin.reagor@joyent.com>
Date: Mon, 19 Mar 2018 22:40:13 -0400
Subject: [PATCH 1/3] Add zerolog logging adapter

---
 log/zerologadapter/adapter.go | 40 +++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 log/zerologadapter/adapter.go

diff --git a/log/zerologadapter/adapter.go b/log/zerologadapter/adapter.go
new file mode 100644
index 00000000..9d9dc1a1
--- /dev/null
+++ b/log/zerologadapter/adapter.go
@@ -0,0 +1,40 @@
+// Package zerologadapter provides a logger that writes to a github.com/rs/zerolog.
+package zerologadapter
+
+import (
+	"github.com/jackc/pgx"
+	"github.com/rs/zerolog"
+)
+
+type Logger struct {
+	logger zerolog.Logger
+}
+
+// NewLogger accepts a zerolog.Logger as input and returns a new custom pgx
+// logging fascade as output.
+func NewLogger(logger zerolog.Logger) *Logger {
+	return &Logger{
+		logger: logger.With().Str("module", "pgx").Logger(),
+	}
+}
+
+func (pl *Logger) Log(level pgx.LogLevel, msg string, data map[string]interface{}) {
+	var zlevel zerolog.Level
+	switch level {
+	case pgx.LogLevelNone:
+		zlevel = zerolog.NoLevel
+	case pgx.LogLevelError:
+		zlevel = zerolog.ErrorLevel
+	case pgx.LogLevelWarn:
+		zlevel = zerolog.WarnLevel
+	case pgx.LogLevelInfo:
+		zlevel = zerolog.InfoLevel
+	case pgx.LogLevelDebug:
+		zlevel = zerolog.DebugLevel
+	default:
+		zlevel = zerolog.DebugLevel
+	}
+
+	pgxlog := l.logger.With().Fields(data).Logger()
+	pgxlog.WithLevel(zlevel).Msg(msg)
+}

From 6429fb5bf760a890113038882c8fc12c5d5f53e2 Mon Sep 17 00:00:00 2001
From: Justin Reagor <justin.reagor@joyent.com>
Date: Tue, 20 Mar 2018 15:48:19 -0400
Subject: [PATCH 2/3] Add github.com/rs/zerolog to Travis

---
 travis/install.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/travis/install.bash b/travis/install.bash
index 61b683ec..63ba875d 100755
--- a/travis/install.bash
+++ b/travis/install.bash
@@ -11,3 +11,4 @@ go get -u github.com/satori/go.uuid
 go get -u github.com/sirupsen/logrus
 go get -u github.com/pkg/errors
 go get -u go.uber.org/zap
+go get -u github.com/rs/zerolog

From 5819bc8fb1f6940e91f3844ede7487c533c37f77 Mon Sep 17 00:00:00 2001
From: Justin Reagor <justin.reagor@joyent.com>
Date: Wed, 21 Mar 2018 00:25:14 -0400
Subject: [PATCH 3/3] Small typo

---
 log/zerologadapter/adapter.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/log/zerologadapter/adapter.go b/log/zerologadapter/adapter.go
index 9d9dc1a1..b3f01c0b 100644
--- a/log/zerologadapter/adapter.go
+++ b/log/zerologadapter/adapter.go
@@ -35,6 +35,6 @@ func (pl *Logger) Log(level pgx.LogLevel, msg string, data map[string]interface{
 		zlevel = zerolog.DebugLevel
 	}
 
-	pgxlog := l.logger.With().Fields(data).Logger()
+	pgxlog := pl.logger.With().Fields(data).Logger()
 	pgxlog.WithLevel(zlevel).Msg(msg)
 }