[ARVADOS] updated: fdea6d02dae5393455683e980c2adec19b4da75c

[git at public.curoverse.com]

Summary of changes:
 services/crunch-run/crunchrun.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

       via  fdea6d02dae5393455683e980c2adec19b4da75c (commit)
      from  856776f2435858d0851f0a1b895f43260f43dee2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit fdea6d02dae5393455683e980c2adec19b4da75c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Feb 15 16:58:34 2016 -0500

    8015: check error when deleting temporary directory.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 775b06d..1b04bb4 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -429,6 +429,8 @@ func (runner *ContainerRunner) AttachLogs() (err error) {
 // WaitFinish waits for the container to terminate, capture the exit code, and
 // close the stdout/stderr logging.
 func (runner *ContainerRunner) WaitFinish() error {
+	runner.CrunchLog.Print("Waiting for container to finish")
+
 	result := runner.Docker.Wait(runner.ContainerID)
 	wr := <-result
 	if wr.Error != nil {
@@ -516,7 +518,9 @@ func (runner *ContainerRunner) CleanupDirs() {
 
 	for _, tmpdir := range runner.CleanupTempDir {
 		rmerr := os.RemoveAll(tmpdir)
-		runner.CrunchLog.Printf("While cleaning up temporary directories: %v", rmerr)
+		if rmerr != nil {
+			runner.CrunchLog.Printf("While cleaning up temporary directory %s: %v", tmpdir, rmerr)
+		}
 	}
 }
 

-----------------------------------------------------------------------


hooks/post-receive
--