From 50f3a696bdfde5aed8f020fbac24af4c6c653ca9 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Sun, 8 Dec 2013 01:33:05 +0000
Subject: [PATCH 1/2] Engine: don't log job stdout to engine stdout (it might
 be non-text output, for example tar data for 'export'

---
 engine/engine.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engine/engine.go b/engine/engine.go
index 34b28f64d..6042a649f 100644
--- a/engine/engine.go
+++ b/engine/engine.go
@@ -112,7 +112,6 @@ func (eng *Engine) Job(name string, args ...string) *Job {
 		Stdout: NewOutput(),
 		Stderr: NewOutput(),
 	}
-	job.Stdout.Add(utils.NopWriteCloser(eng.Stdout))
 	job.Stderr.Add(utils.NopWriteCloser(eng.Stderr))
 	handler, exists := eng.handlers[name]
 	if exists {

From 9656cdf0c248fda629fe9f13cf4ce4d3fabd35a4 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Sun, 8 Dec 2013 01:33:37 +0000
Subject: [PATCH 2/2] Engine: 'export' returns a raw archive of a container's
 filesystem

---
 api.go    |  9 +++++----
 server.go | 26 +++++++++++++++++++-------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/api.go b/api.go
index 0aa969570..0bdb928f7 100644
--- a/api.go
+++ b/api.go
@@ -173,10 +173,11 @@ func getContainersExport(srv *Server, version float64, w http.ResponseWriter, r
 	if vars == nil {
 		return fmt.Errorf("Missing parameter")
 	}
-	name := vars["name"]
-
-	if err := srv.ContainerExport(name, w); err != nil {
-		utils.Errorf("%s", err)
+	job := srv.Eng.Job("export", vars["name"])
+	if err := job.Stdout.Add(w); err != nil {
+		return err
+	}
+	if err := job.Run(); err != nil {
 		return err
 	}
 	return nil
diff --git a/server.go b/server.go
index 49b25f709..314d98d52 100644
--- a/server.go
+++ b/server.go
@@ -70,6 +70,10 @@ func jobInitApi(job *engine.Job) engine.Status {
 	if srv.runtime.networkManager.bridgeNetwork != nil {
 		job.Eng.Hack_SetGlobalVar("httpapi.bridgeIP", srv.runtime.networkManager.bridgeNetwork.IP)
 	}
+	if err := job.Eng.Register("export", srv.ContainerExport); err != nil {
+		job.Error(err)
+		return engine.StatusErr
+	}
 	if err := job.Eng.Register("create", srv.ContainerCreate); err != nil {
 		job.Error(err)
 		return engine.StatusErr
@@ -190,22 +194,30 @@ func (srv *Server) ContainerKill(name string, sig int) error {
 	return nil
 }
 
-func (srv *Server) ContainerExport(name string, out io.Writer) error {
+func (srv *Server) ContainerExport(job *engine.Job) engine.Status {
+	if len(job.Args) != 1 {
+		job.Errorf("Usage: %s container_id", job.Name)
+		return engine.StatusErr
+	}
+	name := job.Args[0]
 	if container := srv.runtime.Get(name); container != nil {
-
 		data, err := container.Export()
 		if err != nil {
-			return err
+			job.Errorf("%s: %s", name, err)
+			return engine.StatusErr
 		}
 
 		// Stream the entire contents of the container (basically a volatile snapshot)
-		if _, err := io.Copy(out, data); err != nil {
-			return err
+		if _, err := io.Copy(job.Stdout, data); err != nil {
+			job.Errorf("%s: %s", name, err)
+			return engine.StatusErr
 		}
+		// FIXME: factor job-specific LogEvent to engine.Job.Run()
 		srv.LogEvent("export", container.ID, srv.runtime.repositories.ImageName(container.Image))
-		return nil
+		return engine.StatusOK
 	}
-	return fmt.Errorf("No such container: %s", name)
+	job.Errorf("No such container: %s", name)
+	return engine.StatusErr
 }
 
 // ImageExport exports all images with the given tag. All versions