Skip to content

Commit 8e89342

Browse files
authored
Add cache status to GitHub request logs (#50)
1 parent 5da3030 commit 8e89342

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

githubapp/middleware.go

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -121,25 +121,24 @@ func ClientLogging(lvl zerolog.Level) ClientMiddleware {
121121
res, err := next.RoundTrip(r)
122122
elapsed := time.Now().Sub(start)
123123

124-
log := zerolog.Ctx(r.Context())
124+
evt := zerolog.Ctx(r.Context()).
125+
WithLevel(lvl).
126+
Str("method", r.Method).
127+
Str("path", r.URL.String()).
128+
Dur("elapsed", elapsed)
129+
125130
if res != nil {
126-
log.WithLevel(lvl).
127-
Str("method", r.Method).
128-
Str("path", r.URL.String()).
129-
Int("status", res.StatusCode).
131+
cached := res.Header.Get(httpcache.XFromCache) != ""
132+
evt.Int("status", res.StatusCode).
130133
Int64("size", res.ContentLength).
131-
Dur("elapsed", elapsed).
132-
Msg("github_request")
134+
Bool("cached", cached)
133135
} else {
134-
log.WithLevel(lvl).
135-
Str("method", r.Method).
136-
Str("path", r.URL.String()).
137-
Int("status", -1).
136+
evt.Int("status", -1).
138137
Int64("size", -1).
139-
Dur("elapsed", elapsed).
140-
Msg("github_request")
138+
Bool("cached", false)
141139
}
142140

141+
evt.Msg("github_request")
143142
return res, err
144143
})
145144
}

0 commit comments

Comments
 (0)