diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-14 09:33:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 09:33:42 -0500 |
| commit | 0fd31e29948631c264df21a128b3de2700f7f007 (patch) | |
| tree | fa8fe500592a9f845761cec95b96e0cf397acdcf /pkg | |
| parent | 803c078d3b844339c5fca0088ffcb759b6256b9b (diff) | |
| parent | 74fcd9fef3a31fa94f3487361b5fda1180e8cee2 (diff) | |
| download | podman-0fd31e29948631c264df21a128b3de2700f7f007.tar.gz podman-0fd31e29948631c264df21a128b3de2700f7f007.tar.bz2 podman-0fd31e29948631c264df21a128b3de2700f7f007.zip | |
Merge pull request #8696 from Luap99/podman-events-until
podman events allow future time for --until
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/handlers/compat/events.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go index f74491a8f..c75511a4d 100644 --- a/pkg/api/handlers/compat/events.go +++ b/pkg/api/handlers/compat/events.go @@ -110,6 +110,7 @@ func GetEvents(w http.ResponseWriter, r *http.Request) { Until: query.Until, } errorChannel <- runtime.Events(r.Context(), readOpts) + }() var flush = func() {} @@ -130,8 +131,8 @@ func GetEvents(w http.ResponseWriter, r *http.Request) { if err != nil { // FIXME StatusOK already sent above cannot send 500 here utils.InternalServerError(w, err) - return } + return case evt := <-eventChannel: if evt == nil { continue |