From d0641062c0342a747c102e381673eeaf4218d47f Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Sat, 4 Jul 2015 04:38:18 +0100
Subject: [PATCH] pass common `launch` args to all three components

ATM that's just --loglevel=...

Closes #1043.
---
 weave | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/weave b/weave
index 49f786acdc..cba1cef9e6 100755
--- a/weave
+++ b/weave
@@ -946,6 +946,18 @@ proxy_addr() {
 # launch helpers
 ######################################################################
 
+common_launch_args() {
+    args=""
+    while [ $# -gt 0 ] ; do
+        case "$1" in
+            --log-level=*)
+                args="$args $1"
+        esac
+        shift
+    done
+    echo "$args"
+}
+
 launch_router() {
     create_bridge
     # We set the router name to the bridge mac since that is
@@ -1113,9 +1125,10 @@ case "$COMMAND" in
         check_not_running $CONTAINER_NAME       $BASE_IMAGE
         check_not_running $DNS_CONTAINER_NAME   $BASE_DNS_IMAGE
         check_not_running $PROXY_CONTAINER_NAME $EXEC_IMAGE
+        COMMON_ARGS=$(common_launch_args "$@")
         launch_router "$@"
-        launch_dns
-        launch_proxy
+        launch_dns    $COMMON_ARGS
+        launch_proxy  $COMMON_ARGS
         ;;
     launch-router)
         check_not_running $CONTAINER_NAME $BASE_IMAGE