Added log adapter for logrus

Also changed standard logger interface to take a map instead of varargs for
extra data.

log/log15adapter/adapter.go

@@ -24,19 +24,24 @@ func NewLogger(l Log15Logger) *Logger {
 	return &Logger{l: l}
 }
 
-func (l *Logger) Log(level pgx.LogLevel, msg string, ctx ...interface{}) {
+func (l *Logger) Log(level pgx.LogLevel, msg string, data map[string]interface{}) {
+	logArgs := make([]interface{}, 0, len(data))
+	for k, v := range data {
+		logArgs = append(logArgs, k, v)
+	}
+
 	switch level {
 	case pgx.LogLevelTrace:
-		l.l.Debug(msg, append(ctx, "PGX_LOG_LEVEL", level)...)
+		l.l.Debug(msg, append(logArgs, "PGX_LOG_LEVEL", level)...)
 	case pgx.LogLevelDebug:
-		l.l.Debug(msg, ctx...)
+		l.l.Debug(msg, logArgs...)
 	case pgx.LogLevelInfo:
-		l.l.Info(msg, ctx...)
+		l.l.Info(msg, logArgs...)
 	case pgx.LogLevelWarn:
-		l.l.Warn(msg, ctx...)
+		l.l.Warn(msg, logArgs...)
 	case pgx.LogLevelError:
-		l.l.Error(msg, ctx...)
+		l.l.Error(msg, logArgs...)
 	default:
-		l.l.Error(msg, append(ctx, "INVALID_PGX_LOG_LEVEL", level)...)
+		l.l.Error(msg, append(logArgs, "INVALID_PGX_LOG_LEVEL", level)...)
 	}
 }

log/logrusadapter/adapter.go

@@ -0,0 +1,40 @@
+// Package logrusadapter provides a logger that writes to a github.com/Sirupsen/logrus.Logger
+// log.
+package logrusadapter
+
+import (
+	"github.com/Sirupsen/logrus"
+	"github.com/jackc/pgx"
+)
+
+type Logger struct {
+	l *logrus.Logger
+}
+
+func NewLogger(l *logrus.Logger) *Logger {
+	return &Logger{l: l}
+}
+
+func (l *Logger) Log(level pgx.LogLevel, msg string, data map[string]interface{}) {
+	var logger logrus.FieldLogger
+	if data != nil {
+		logger = l.l.WithFields(data)
+	} else {
+		logger = l.l
+	}
+
+	switch level {
+	case pgx.LogLevelTrace:
+		logger.WithField("PGX_LOG_LEVEL", level).Debug(msg)
+	case pgx.LogLevelDebug:
+		logger.Debug(msg)
+	case pgx.LogLevelInfo:
+		logger.Info(msg)
+	case pgx.LogLevelWarn:
+		logger.Warn(msg)
+	case pgx.LogLevelError:
+		logger.Error(msg)
+	default:
+		logger.WithField("INVALID_PGX_LOG_LEVEL", level).Error(msg)
+	}
+}

log/testingadapter/adapter.go

@@ -3,6 +3,8 @@
 package testingadapter
 
 import (
+	"fmt"
+
 	"github.com/jackc/pgx"
 )
 
@@ -20,6 +22,11 @@ func NewLogger(l TestingLogger) *Logger {
 	return &Logger{l: l}
 }
 
-func (l *Logger) Log(level pgx.LogLevel, msg string, ctx ...interface{}) {
-	l.l.Log(level, msg, ctx)
+func (l *Logger) Log(level pgx.LogLevel, msg string, data map[string]interface{}) {
+	logArgs := make([]interface{}, 0, 2+len(data))
+	logArgs = append(logArgs, level, msg)
+	for k, v := range data {
+		logArgs = append(logArgs, fmt.Sprintf("%s=%v", k, v))
+	}
+	l.l.Log(logArgs...)
 }