From 41935259319ba711064d6e6687ced93109a89779 Mon Sep 17 00:00:00 2001 From: Ryan Uber Date: Thu, 19 Feb 2015 18:51:32 -0800 Subject: [PATCH] agent: Better warning for keyring with -encrypt option. Fixes #718. --- command/agent/command.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/command/agent/command.go b/command/agent/command.go index dd6cac6bba..19129eaec8 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -162,12 +162,12 @@ func (c *Command) readConfig() *Config { } keyfileLAN := filepath.Join(config.DataDir, serfLANKeyring) if _, err := os.Stat(keyfileLAN); err == nil { - c.Ui.Error("WARNING: LAN keyring exists but -encrypt given, ignoring") + c.Ui.Error("WARNING: LAN keyring exists but -encrypt given, using keyring") } if config.Server { keyfileWAN := filepath.Join(config.DataDir, serfWANKeyring) if _, err := os.Stat(keyfileWAN); err == nil { - c.Ui.Error("WARNING: WAN keyring exists but -encrypt given, ignoring") + c.Ui.Error("WARNING: WAN keyring exists but -encrypt given, using keyring") } } }