diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-12 13:28:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 13:28:55 +0100 |
| commit | be37d144e78c1948aaf9f3e7b040ac1afdb9120d (patch) | |
| tree | f5526eb39509c71a56f0df02069b02f1d197acc1 /pkg/api/server | |
| parent | 4f44a1a3a26f4cb82efc6a727586f721ebf505ca (diff) | |
| parent | 5b830cca9042892af5461d87ade3e9dd61d95e43 (diff) | |
| download | podman-be37d144e78c1948aaf9f3e7b040ac1afdb9120d.tar.gz podman-be37d144e78c1948aaf9f3e7b040ac1afdb9120d.tar.bz2 podman-be37d144e78c1948aaf9f3e7b040ac1afdb9120d.zip | |
Merge pull request #5175 from baude/apiv2events
apiv2 stream events
Diffstat (limited to 'pkg/api/server')
| -rw-r--r-- | pkg/api/server/register_events.go | 2 | ||||
| -rw-r--r-- | pkg/api/server/server.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkg/api/server/register_events.go b/pkg/api/server/register_events.go index a32244f4d..090f66323 100644 --- a/pkg/api/server/register_events.go +++ b/pkg/api/server/register_events.go @@ -29,7 +29,7 @@ func (s *APIServer) RegisterEventsHandlers(r *mux.Router) error { // description: JSON encoded map[string][]string of constraints // responses: // 200: - // $ref: "#/responses/ok" + // description: returns a string of json data describing an event // 500: // "$ref": "#/responses/InternalError" r.Handle(VersionedPath("/events"), APIHandler(s.Context, handlers.GetEvents)) diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go index 7bb0f5481..87b11b716 100644 --- a/pkg/api/server/server.go +++ b/pkg/api/server/server.go @@ -106,6 +106,7 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li server.RegisterContainersHandlers, server.RegisterDistributionHandlers, server.registerExecHandlers, + server.RegisterEventsHandlers, server.registerHealthCheckHandlers, server.registerImagesHandlers, server.registerInfoHandlers, |