diff --git a/api/server/server.go b/api/server/server.go index 95642f992d..57444a4489 100644 --- a/api/server/server.go +++ b/api/server/server.go @@ -351,10 +351,24 @@ func getContainersChanges(eng *engine.Engine, version version.Version, w http.Re if vars == nil { return fmt.Errorf("Missing parameter") } - var job = eng.Job("container_changes", vars["name"]) - streamJSON(job, w, false) - return job.Run() + name := vars["name"] + if name == "" { + return fmt.Errorf("Container name cannot be empty") + } + + d := getDaemon(eng) + cont, err := d.Get(name) + if err != nil { + return err + } + + changes, err := cont.Changes() + if err != nil { + return err + } + + return writeJSON(w, http.StatusOK, changes) } func getContainersTop(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error { diff --git a/daemon/changes.go b/daemon/changes.go deleted file mode 100644 index 7f261a8a7f..0000000000 --- a/daemon/changes.go +++ /dev/null @@ -1,31 +0,0 @@ -package daemon - -import ( - "encoding/json" - "fmt" - - "github.com/docker/docker/engine" -) - -func (daemon *Daemon) ContainerChanges(job *engine.Job) error { - if n := len(job.Args); n != 1 { - return fmt.Errorf("Usage: %s CONTAINER", job.Name) - } - name := job.Args[0] - - container, err := daemon.Get(name) - if err != nil { - return err - } - - changes, err := container.Changes() - if err != nil { - return err - } - - if err = json.NewEncoder(job.Stdout).Encode(changes); err != nil { - return err - } - - return nil -} diff --git a/daemon/daemon.go b/daemon/daemon.go index b2d149183b..67b6938443 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -116,7 +116,6 @@ func (daemon *Daemon) Install(eng *engine.Engine) error { // FIXME: remove ImageDelete's dependency on Daemon, then move to graph/ for name, method := range map[string]engine.Handler{ "commit": daemon.ContainerCommit, - "container_changes": daemon.ContainerChanges, "container_copy": daemon.ContainerCopy, "container_rename": daemon.ContainerRename, "container_inspect": daemon.ContainerInspect,