From bb8c7c599cdb2f4d8d2410772ba5b3ea68b1eb2f Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 12 Jan 2016 16:41:26 +0000
Subject: [PATCH] Revert "don't launch anything when plugin is running"

This reverts commit 3ade796e8d18a9d4253ce464463dd94114300052.
---
 weave | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/weave b/weave
index c37f332d..19f826e8 100755
--- a/weave
+++ b/weave
@@ -1846,11 +1846,14 @@ EOF
         deprecation_warnings "$@"
         check_not_running router $CONTAINER_NAME        $BASE_IMAGE
         check_not_running proxy  $PROXY_CONTAINER_NAME  $BASE_EXEC_IMAGE
-        check_not_running plugin $PLUGIN_CONTAINER_NAME $BASE_PLUGIN_IMAGE
         COMMON_ARGS=$(common_launch_args "$@")
         launch_router "$@"
         launch_proxy  $COMMON_ARGS
-        plugin_disabled || launch_plugin $COMMON_ARGS
+        # Allow an existing plugin to keep running, because we run it with restart=always
+        if ! plugin_disabled ; then
+            check_not_running plugin $PLUGIN_CONTAINER_NAME $BASE_PLUGIN_IMAGE 
+            launch_plugin $COMMON_ARGS
+        fi
         ;;
     launch-router)
         deprecation_warnings "$@"