diff --git a/glide.lock b/glide.lock index 8414cc5..1bf2483 100644 --- a/glide.lock +++ b/glide.lock @@ -1,15 +1,16 @@ -hash: 96066ac6a330e905043a5997a3602922c5a6c5fb739a588a228b64005c3c5d0f -updated: 2017-02-27T15:38:14.406012+08:00 +hash: e66f9a0a06649ef84661b84e7f965ea86af6b01994d1cf3a3d766de024fde246 +updated: 2017-03-23T14:41:37.6496202+08:00 imports: - name: github.com/satori/go.uuid version: 879c5887cd475cd7864858769793b2ceb0d44feb - name: go.uber.org/atomic version: 3b8db5e93c4c02efbc313e17b2e796b0914a01fb - name: go.uber.org/zap - version: a03b90bc236f3def382f17743518889a31f8187c + version: 4257c7cf05477d92ec25c31cfd3d60e89575f18a subpackages: - buffer - internal/bufferpool + - internal/color - internal/exit - internal/multierror - zapcore @@ -19,6 +20,6 @@ testImports: - name: github.com/pborman/uuid version: 1b00554d822231195d1babd97ff4a781231955c9 - name: golang.org/x/tools - version: 496819729719f9d07692195e0a94d6edd2251389 + version: c21bc47f893ee73c18dd2119bb8ff9a2b492c4c6 subpackages: - cover diff --git a/glide.yaml b/glide.yaml index ae2c7b7..f3f4ae2 100644 --- a/glide.yaml +++ b/glide.yaml @@ -3,7 +3,7 @@ import: - package: github.com/satori/go.uuid version: ^1.1.0 - package: go.uber.org/zap - version: ^1.0.0-rc.2 + version: ^1.0.0 subpackages: - zapcore testImport: diff --git a/lg.go b/lg.go index e2f393d..887f01c 100644 --- a/lg.go +++ b/lg.go @@ -60,9 +60,11 @@ func L(ctx context.Context) *zap.Logger { // LogRequest to log every request. func LogRequest(next http.Handler) http.Handler { fn := func(w http.ResponseWriter, r *http.Request) { + // Add a requestID field to logger l := log.With(zap.String("requestID", uuid.NewV1().String())) - ctx := r.Context() - ctx = context.WithValue(ctx, requestIDKey, l) + // Add logger to context + ctx := context.WithValue(r.Context(), requestIDKey, l) + // Request with this new context. r = r.WithContext(ctx) // Start timer