summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-19 23:49:44 +0100
committerGitHub <noreply@github.com>2020-03-19 23:49:44 +0100
commitd927b43350a079c05f54e984838b851bcc2e5931 (patch)
tree70a7e573f71d0ff3d38b349774bc19fdc2989602 /pkg/api
parentaa6c8c2e55a7de14fb22f89af14d5c0636eecee0 (diff)
parentd1c26af144b314f30cd69d42e33ab8cbacb080ff (diff)
downloadpodman-d927b43350a079c05f54e984838b851bcc2e5931.tar.gz
podman-d927b43350a079c05f54e984838b851bcc2e5931.tar.bz2
podman-d927b43350a079c05f54e984838b851bcc2e5931.zip
Merge pull request #5525 from baude/apiv2bindinglogs
apiv2 add bindings for logs|events
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/handlers/compat/containers.go2
-rw-r--r--pkg/api/server/register_events.go2
2 files changed, 1 insertions, 3 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index e7031f471..3a269fe50 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -326,7 +326,6 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
builder.WriteRune(' ')
}
builder.WriteString(line.Msg)
-
// Build header and output entry
binary.BigEndian.PutUint32(header[4:], uint32(len(header)+builder.Len()))
if _, err := w.Write(header[:]); err != nil {
@@ -335,7 +334,6 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) {
if _, err := fmt.Fprint(w, builder.String()); err != nil {
log.Errorf("unable to write builder string: %q", err)
}
-
if flusher, ok := w.(http.Flusher); ok {
flusher.Flush()
}
diff --git a/pkg/api/server/register_events.go b/pkg/api/server/register_events.go
index b0f403709..e909303da 100644
--- a/pkg/api/server/register_events.go
+++ b/pkg/api/server/register_events.go
@@ -63,6 +63,6 @@ func (s *APIServer) registerEventsHandlers(r *mux.Router) error {
// description: returns a string of json data describing an event
// 500:
// "$ref": "#/responses/InternalError"
- r.Handle(VersionedPath("/events"), s.APIHandler(compat.GetEvents)).Methods(http.MethodGet)
+ r.Handle(VersionedPath("/libpod/events"), s.APIHandler(compat.GetEvents)).Methods(http.MethodGet)
return nil
}