diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-09-22 09:32:59 -0700 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-09-25 10:59:35 -0400 |
| commit | bcd5128207fa60a24064c8f97c45fabd85fc231a (patch) | |
| tree | 1e08ee40585b472310ecd30305ed7b9f7110438a | |
| parent | bc8ada648a748198ec0cae706f18398e6b91c803 (diff) | |
| download | podman-bcd5128207fa60a24064c8f97c45fabd85fc231a.tar.gz podman-bcd5128207fa60a24064c8f97c45fabd85fc231a.tar.bz2 podman-bcd5128207fa60a24064c8f97c45fabd85fc231a.zip | |
Add Server header to API service responses
Aids in reading logs of different services
Signed-off-by: Jhon Honce <jhonce@redhat.com>
| -rw-r--r-- | pkg/api/server/handler_api.go | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go index f2ce0301b..920811c51 100644 --- a/pkg/api/server/handler_api.go +++ b/pkg/api/server/handler_api.go @@ -34,15 +34,18 @@ func (s *APIServer) APIHandler(h http.HandlerFunc) http.HandlerFunc { } // TODO: Use r.ConnContext when ported to go 1.13 - c := context.WithValue(r.Context(), "decoder", s.Decoder) //nolint - c = context.WithValue(c, "runtime", s.Runtime) //nolint - c = context.WithValue(c, "shutdownFunc", s.Shutdown) //nolint - c = context.WithValue(c, "idletracker", s.idleTracker) //nolint + c := context.WithValue(r.Context(), "decoder", s.Decoder) // nolint + c = context.WithValue(c, "runtime", s.Runtime) // nolint + c = context.WithValue(c, "shutdownFunc", s.Shutdown) // nolint + c = context.WithValue(c, "idletracker", s.idleTracker) // nolint r = r.WithContext(c) - v := utils.APIVersion[utils.CompatTree][utils.CurrentAPIVersion] - w.Header().Set("API-Version", fmt.Sprintf("%d.%d", v.Major, v.Minor)) - w.Header().Set("Libpod-API-Version", utils.APIVersion[utils.LibpodTree][utils.CurrentAPIVersion].String()) + cv := utils.APIVersion[utils.CompatTree][utils.CurrentAPIVersion] + w.Header().Set("API-Version", fmt.Sprintf("%d.%d", cv.Major, cv.Minor)) + + lv := utils.APIVersion[utils.LibpodTree][utils.CurrentAPIVersion].String() + w.Header().Set("Libpod-API-Version", lv) + w.Header().Set("Server", "Libpod/"+lv+" ("+runtime.GOOS+")") h(w, r) } |