diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-24 06:56:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 06:56:55 -0800 |
| commit | 81e59a742b46d41848c8c213e155fbc9ecc4e5f8 (patch) | |
| tree | bb0fade91f9d35015b10316cf362f46e03a4a035 /pkg/api/server | |
| parent | 5bad873c4cd9fab9112e1d84ba376d47073cc8bb (diff) | |
| parent | 9634e7eef77abbba2584b8e78daf9c76cfdcedd9 (diff) | |
| download | podman-81e59a742b46d41848c8c213e155fbc9ecc4e5f8.tar.gz podman-81e59a742b46d41848c8c213e155fbc9ecc4e5f8.tar.bz2 podman-81e59a742b46d41848c8c213e155fbc9ecc4e5f8.zip | |
Merge pull request #4958 from jwhonce/wip/filters
[CI:DOCS] Add query parameter converters for complex types
Diffstat (limited to 'pkg/api/server')
| -rw-r--r-- | pkg/api/server/server.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go index 847d11c3c..8c940763e 100644 --- a/pkg/api/server/server.go +++ b/pkg/api/server/server.go @@ -11,6 +11,7 @@ import ( "time" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/pkg/api/handlers" "github.com/coreos/go-systemd/activation" "github.com/gorilla/mux" "github.com/gorilla/schema" @@ -71,7 +72,7 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li ReadTimeout: 20 * time.Second, WriteTimeout: 2 * time.Minute, }, - Decoder: schema.NewDecoder(), + Decoder: handlers.NewAPIDecoder(), Context: nil, Runtime: runtime, Listener: *listener, @@ -85,6 +86,7 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li }) ctx, cancelFn := context.WithCancel(context.Background()) + server.CancelFunc = cancelFn // TODO: Use ConnContext when ported to go 1.13 ctx = context.WithValue(ctx, "decoder", server.Decoder) @@ -92,9 +94,6 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li ctx = context.WithValue(ctx, "shutdownFunc", server.Shutdown) server.Context = ctx - server.CancelFunc = cancelFn - server.Decoder.IgnoreUnknownKeys(true) - router.NotFoundHandler = http.HandlerFunc( func(w http.ResponseWriter, r *http.Request) { // We can track user errors... |