From 01e3d1d81b7e5c26a7ed91ac6a7fb650b61df367 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 6 May 2016 15:45:54 +0100
Subject: [PATCH] Refactor: extract kill_container function

---
 weave | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/weave b/weave
index 3662412f..3edb0d57 100755
--- a/weave
+++ b/weave
@@ -828,9 +828,13 @@ with_container_netns() {
     return $STATUS
 }
 
+kill_container() {
+    docker kill $1 >/dev/null 2>&1 || true
+}
+
 with_container_netns_or_die() {
     if ! with_container_netns "$@" >/dev/null ; then
-        docker kill $1 >/dev/null 2>&1 || true
+        kill_container $1
         exit 1
     fi
 }
@@ -1129,7 +1133,7 @@ wait_for_status() {
     while true ; do
         "$@" GET /status >/dev/null 2>&1 && return 0
         if ! check_running $container >/dev/null 2>&1 ; then
-            docker kill $container >/dev/null 2>&1 || true # stop it restarting
+            kill_container $container # stop it restarting
             echo $(death_msg $container) >&2
             return 1
         fi
@@ -1451,7 +1455,7 @@ ipam_cidrs() {
 
 ipam_cidrs_or_die() {
     if ! ipam_cidrs "$@" ; then
-        docker kill $2 >/dev/null 2>&1 || true
+        kill_container $2
         exit 1
     fi
 }