From 3ade796e8d18a9d4253ce464463dd94114300052 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Tue, 22 Dec 2015 12:30:53 +0000
Subject: [PATCH] don't launch anything when plugin is running

...just as we don't launch anything if either the router or proxy are
running.

Fixes #1818.
---
 weave | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/weave b/weave
index 21950e60..27a6d746 100755
--- a/weave
+++ b/weave
@@ -1850,15 +1850,13 @@ EOF
         ;;
     launch)
         deprecation_warnings "$@"
-        check_not_running $CONTAINER_NAME       $BASE_IMAGE
-        check_not_running $PROXY_CONTAINER_NAME $BASE_EXEC_IMAGE
+        check_not_running $CONTAINER_NAME        $BASE_IMAGE
+        check_not_running $PROXY_CONTAINER_NAME  $BASE_EXEC_IMAGE
+        check_not_running $PLUGIN_CONTAINER_NAME $BASE_PLUGIN_IMAGE
         COMMON_ARGS=$(common_launch_args "$@")
         launch_router "$@"
         launch_proxy  $COMMON_ARGS
-        if [ -z $WEAVE_NO_PLUGIN ] && check_docker_server_api_version 1.21 ; then
-            check_not_running $PLUGIN_CONTAINER_NAME $BASE_PLUGIN_IMAGE
-            launch_plugin $COMMON_ARGS
-        fi
+        [ -z $WEAVE_NO_PLUGIN ] && check_docker_server_api_version 1.21 && launch_plugin $COMMON_ARGS
         ;;
     launch-router)
         deprecation_warnings "$@"