foomo/sesamy-go
1
0
Fork 0
mirror of https://github.com/foomo/sesamy-go.git synced 2025-10-16 12:35:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: log fields

Browse Source
This commit is contained in:
Kevin Franklin Kim 2024-03-08 10:25:24 +01:00
parent b45f2c844d
commit 4850fcea3d
No known key found for this signature in database
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
integration/watermill/keel/subscriber.go
View File

@ -59,7 +59,7 @@ func SubscriberWithLogger(fields ...zap.Field) SubscriberOption {
return func(o *Subscriber) { return func(o *Subscriber) {
o.middlewares = append(o.middlewares, func(next SubscriberHandler) SubscriberHandler { o.middlewares = append(o.middlewares, func(next SubscriberHandler) SubscriberHandler {
return func(l *zap.Logger, r *http.Request, event *mpv2.Event) error { return func(l *zap.Logger, r *http.Request, event *mpv2.Event) error {
fields = append(fields, zap.String("event_name", mp.GetDefault(event.EventName, "-").String())) fields := append(fields, zap.String("event_name", mp.GetDefault(event.EventName, "-").String()))
if labeler, ok := keellog.LabelerFromRequest(r); ok { if labeler, ok := keellog.LabelerFromRequest(r); ok {
labeler.Add(fields...) labeler.Add(fields...)
} }
@ -101,9 +101,6 @@ func NewSubscriber(l *zap.Logger, opts ...SubscriberOption) *Subscriber {
func (s *Subscriber) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (s *Subscriber) ServeHTTP(w http.ResponseWriter, r *http.Request) {
var values url.Values var values url.Values
// local logger
l := s.l
switch r.Method { switch r.Method {
case http.MethodGet: case http.MethodGet:
values = r.URL.Query() values = r.URL.Query()
@ -132,14 +129,14 @@ func (s *Subscriber) ServeHTTP(w http.ResponseWriter, r *http.Request) {
values = r.URL.Query() values = r.URL.Query()
} }
default: default:
keelhttputils.ServerError(l, w, r, http.StatusMethodNotAllowed, errors.New(http.StatusText(http.StatusMethodNotAllowed))) keelhttputils.ServerError(s.l, w, r, http.StatusMethodNotAllowed, errors.New(http.StatusText(http.StatusMethodNotAllowed)))
return return
} }
// unmarshal event // unmarshal event
var event *mpv2.Event var event *mpv2.Event
if err := mpv2.Decode(values, &event); err != nil { if err := mpv2.Decode(values, &event); err != nil {
keelhttputils.InternalServerError(l, w, r, errors.Wrap(err, "failed to marshal url values")) keelhttputils.InternalServerError(s.l, w, r, errors.Wrap(err, "failed to marshal url values"))
return return
} }
@ -150,8 +147,8 @@ func (s *Subscriber) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
// run handler // run handler
if err := next(l, r, event); err != nil { if err := next(s.l, r, event); err != nil {
keelhttputils.InternalServerError(l, w, r, err) keelhttputils.InternalServerError(s.l, w, r, err)
return return
} }
} }