Merge branch 'master' into 12018-sync-groups-tool

[arvados.git] / services / crunch-run / crunchrun.go

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index c4e1859f781d3ff17fca15911cb93118a1ec4e59..1665742c5fb02cc20f78cd321d6ad387b069792a 100644 (file)
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -260,12 +260,13 @@ func (runner *ContainerRunner) LoadImage() (err error) {
                if err != nil {
                        return fmt.Errorf("While loading container image into Docker: %v", err)
                }
+
+               defer response.Body.Close()
                rbody, err := ioutil.ReadAll(response.Body)
                if err != nil {
-                       return fmt.Errorf("While reading response to container image into Docker: %v", err)
+                       return fmt.Errorf("Reading response to image load: %v", err)
                }
-               log.Printf("Docker response: %v", string(rbody))
-               response.Body.Close()
+               runner.CrunchLog.Printf("Docker response: %s", rbody)
        } else {
                runner.CrunchLog.Print("Docker image is available")
        }