diff --git a/prog/weaveutil/plugin_network.go b/prog/weaveutil/plugin_network.go index 451e2bf9..f3a4a272 100644 --- a/prog/weaveutil/plugin_network.go +++ b/prog/weaveutil/plugin_network.go @@ -65,6 +65,7 @@ func isDockerPluginEnabled(args []string) error { for _, p := range plugins { if p.Enabled && strings.Contains(p.Name, pluginName) { + fmt.Println(p.Name) return nil } } diff --git a/weave b/weave index f807492e..caa105c3 100755 --- a/weave +++ b/weave @@ -1526,7 +1526,7 @@ case "$COMMAND" in echo "Invalid 'weave status' sub-command: $SUB_COMMAND" >&2 usage fi - if [ -z "$SUB_STATUS" ] && PROXY_ADDRS=$(proxy_addrs) ; then + if [ -z "$SUB_STATUS" ] && PROXY_ADDRS=$(proxy_addrs 2>/dev/null) ; then echo echo " Service: proxy" echo " Address: $PROXY_ADDRS" @@ -1535,10 +1535,10 @@ case "$COMMAND" in echo echo " Service: plugin (v1)" echo " DriverName: weave" - elif [ -z "$SUB_STATUS" ] && is_plugin_v2_enabled ; then + elif [ -z "$SUB_STATUS" ] && PLUGIN_FULL_NAME=$(is_plugin_v2_enabled) ; then echo echo " Service: plugin (v2)" - echo " DriverName: $PLUGIN_NAME" + echo " DriverName: $PLUGIN_FULL_NAME" fi [ -n "$SUB_STATUS" ] || echo [ $res -eq 0 ]