Fix DriverName for plugin-v2

Print the full plugin-v2 name which might include a registry name.

Also, do not print error from "proxy_addrs".
This commit is contained in:
Martynas Pumputis committed 2017-05-12 14:22:39 +03:00
1 parent 2285942384
commit 0e3ac00ff5
2 files changed
+4 -3

No files matched your search

+1
View File
@@ -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
}
}
+3 -3
View File
@@ -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 ]