From 9d54815c2690353a295b602b67084fd1f3c095e8 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Wed, 15 Jan 2020 16:36:27 +0100 Subject: refactor top code Move the top logic from pkg/adapter into the (*libpod.Container).Top(). This way, we drop the dependency from pkg/api on pkg/adapters and have a clearer separation of concerns. Signed-off-by: Valentin Rothberg --- pkg/api/handlers/containers_top.go | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'pkg/api') diff --git a/pkg/api/handlers/containers_top.go b/pkg/api/handlers/containers_top.go index 711f6858f..1a310262c 100644 --- a/pkg/api/handlers/containers_top.go +++ b/pkg/api/handlers/containers_top.go @@ -4,10 +4,7 @@ import ( "net/http" "strings" - "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/libpod" - "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/pkg/adapter" "github.com/containers/libpod/pkg/api/handlers/utils" "github.com/gorilla/mux" "github.com/gorilla/schema" @@ -30,19 +27,14 @@ func TopContainer(w http.ResponseWriter, r *http.Request) { } name := mux.Vars(r)["name"] + c, err := runtime.LookupContainer(name) + if err != nil { + utils.ContainerNotFound(w, name, err) + return + } - adapterRuntime := adapter.LocalRuntime{} - adapterRuntime.Runtime = runtime - - topValues := cliconfig.TopValues{} - topValues.InputArgs = []string{name, query.PsArgs} - - output, err := adapterRuntime.Top(&topValues) + output, err := c.Top([]string{query.PsArgs}) if err != nil { - if errors.Cause(err) == define.ErrNoSuchCtr { - utils.ContainerNotFound(w, name, err) - return - } utils.InternalServerError(w, err) return } -- cgit v1.2.3-54-g00ecf