From 3cb16aa9a8eb185c00c2ed2600d298fb9fbdcc5e Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Sat, 22 Jul 2017 12:25:02 -0700 Subject: [PATCH] small fixes --- client/driver/lxc.go | 9 ++++++--- scripts/travis.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/client/driver/lxc.go b/client/driver/lxc.go index ccd6e6b11..5008b2a94 100644 --- a/client/driver/lxc.go +++ b/client/driver/lxc.go @@ -382,13 +382,16 @@ func (h *lxcDriverHandle) Exec(ctx context.Context, cmd string, args []string) ( } func (h *lxcDriverHandle) Kill() error { - h.logger.Printf("[INFO] driver.lxc: shutting down container %q", h.container.Name()) + name := h.container.Name()() + + h.logger.Printf("[INFO] driver.lxc: shutting down container %q", nmae) if err := h.container.Shutdown(h.killTimeout); err != nil { - h.logger.Printf("[INFO] driver.lxc: shutting down container %q failed: %v", h.container.Name(), err) + h.logger.Printf("[INFO] driver.lxc: shutting down container %q failed: %v", name, err) if err := h.container.Stop(); err != nil { - h.logger.Printf("[ERR] driver.lxc: error stopping container %q: %v", h.container.Name(), err) + h.logger.Printf("[ERR] driver.lxc: error stopping container %q: %v", name, err) } } + close(h.doneCh) return nil } diff --git a/scripts/travis.sh b/scripts/travis.sh index 0c4dc4cae..32d584f42 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -7,7 +7,7 @@ PING_LOOP_PID=$! trap "kill $PING_LOOP_PID" EXIT HUP INT QUIT TERM -GOTEST_FLAGS="-parallel=8" make test +GOTEST_FLAGS="-parallel=4" make test TEST_OUTPUT=$? kill $PING_LOOP_PID