Create a ContextWithLogger function (#14)

Turns out I need to add loggers to contexts outside ths package.

logrus is apparently normally called Sirupsen/logrus, not sirupsen/logrus.

.travis.yml

@@ -4,7 +4,7 @@ go:
 install:
  - go get github.com/golang/lint/golint
  - go get github.com/fzipp/gocyclo
- - go get github.com/sirupsen/logrus
+ - go get github.com/Sirupsen/logrus
  - go get github.com/mattn/goveralls
 script:
  - ./hooks/pre-commit

context.go

@@ -3,7 +3,7 @@ package util
 import (
 	"context"
 
-	log "github.com/sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 )
 
 // contextKeys is a type alias for string to namespace Context keys per-package.
@@ -35,3 +35,8 @@ func GetLogger(ctx context.Context) *log.Entry {
 	}
 	return l.(*log.Entry)
 }
+
+// ContextWithLogger creates a new context, which will use the given logger.
+func ContextWithLogger(ctx context.Context, l *log.Entry) context.Context {
+	return context.WithValue(ctx, ctxValueLogger, l)
+}

json.go

@@ -8,7 +8,7 @@ import (
 	"runtime/debug"
 	"time"
 
-	log "github.com/sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 )
 
 // JSONResponse represents an HTTP response which contains a JSON body.
@@ -99,7 +99,7 @@ func Protect(handler http.HandlerFunc) http.HandlerFunc {
 func RequestWithLogging(req *http.Request) *http.Request {
 	reqID := RandomString(12)
 	// Set a Logger and request ID on the context
-	ctx := context.WithValue(req.Context(), ctxValueLogger, log.WithFields(log.Fields{
+	ctx := ContextWithLogger(req.Context(), log.WithFields(log.Fields{
 		"req.method": req.Method,
 		"req.path":   req.URL.Path,
 		"req.id":     reqID,

json_test.go

@@ -7,7 +7,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	log "github.com/sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 )
 
 type MockJSONRequestHandler struct {