Fix logging when first arg is a context.Context without a logger
This commit is contained in:
@@ -180,6 +180,7 @@ func extractLogger(ctx interface{}) (*logrus.Entry, error) {
|
|||||||
if logger != nil {
|
if logger != nil {
|
||||||
return logger.(*logrus.Entry), nil
|
return logger.(*logrus.Entry), nil
|
||||||
}
|
}
|
||||||
|
return extractLogger(NewContext(ctx))
|
||||||
case *http.Request:
|
case *http.Request:
|
||||||
return extractLogger(ctx.Context())
|
return extractLogger(ctx.Context())
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -41,8 +41,8 @@ var _ = Describe("Logger", func() {
|
|||||||
Expect(hook.LastEntry().Data).To(BeEmpty())
|
Expect(hook.LastEntry().Data).To(BeEmpty())
|
||||||
})
|
})
|
||||||
|
|
||||||
XIt("Empty context", func() {
|
It("Empty context", func() {
|
||||||
Error(context.Background(), "Simple Message")
|
Error(context.TODO(), "Simple Message")
|
||||||
Expect(hook.LastEntry().Message).To(Equal("Simple Message"))
|
Expect(hook.LastEntry().Message).To(Equal("Simple Message"))
|
||||||
Expect(hook.LastEntry().Data).To(BeEmpty())
|
Expect(hook.LastEntry().Data).To(BeEmpty())
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user