From 6ba2bf80b801c956b33582f3992a7b6d708942e3 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Sat, 13 May 2017 14:11:32 +0100 Subject: [PATCH] Remove some duplication between stop and reset --- weave | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/weave b/weave index f05f1bb3..4ea090b6 100755 --- a/weave +++ b/weave @@ -1327,6 +1327,9 @@ stop() { ! is_plugin_v1_enabled || util_op remove-plugin-network weave || true warn_if_stopping_proxy_in_env docker stop $CONTAINER_NAME >/dev/null 2>&1 || echo "Weave is not running." >&2 + # In case user has upgraded from /dev/null 2>&1 || true + docker stop $OLD_PROXY_CONTAINER_NAME >/dev/null 2>&1 || true conntrack -D -p udp --dport $PORT >/dev/null 2>&1 || true } @@ -1619,14 +1622,9 @@ case "$COMMAND" in stop) [ $# -eq 0 ] || usage stop - # In case user has upgraded from /dev/null 2>&1 || true - docker stop $OLD_PROXY_CONTAINER_NAME >/dev/null 2>&1 || true ;; reset) [ $# -eq 0 ] || [ $# -eq 1 -a "$1" = "--force" ] || usage - ! is_plugin_v1_enabled || util_op remove-plugin-network weave || true - warn_if_stopping_proxy_in_env res=0 [ "$1" = "--force" ] || check_running $CONTAINER_NAME 2>/dev/null || res=$? case $res in @@ -1643,14 +1641,13 @@ case "$COMMAND" in exit 1 ;; esac + stop for NAME in $CONTAINER_NAME $OLD_PROXY_CONTAINER_NAME $OLD_PLUGIN_CONTAINER_NAME ; do - docker stop $NAME >/dev/null 2>&1 || true docker rm -f $NAME >/dev/null 2>&1 || true done protect_against_docker_hang VOLUME_CONTAINERS=$(docker ps -qa --filter label=weavevolumes) [ -n "$VOLUME_CONTAINERS" ] && docker rm -v $VOLUME_CONTAINERS >/dev/null 2>&1 || true - conntrack -D -p udp --dport $PORT >/dev/null 2>&1 || true destroy_bridge for LOCAL_IFNAME in $(ip link show | grep v${CONTAINER_IFNAME}pl | cut -d ' ' -f 2 | tr -d ':') ; do ip link del ${LOCAL_IFNAME%@*} >/dev/null 2>&1 || true