status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-13 15:26:48 +00:00
Code Issues Projects Releases Wiki Activity

agent: Better warning for keyring with -encrypt option. Fixes #718.

Browse Source
This commit is contained in:
Ryan Uber 2015-02-19 18:51:32 -08:00
parent be8b14979e
commit 4193525931
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
command/agent/command.go
View File

@ -162,12 +162,12 @@ func (c *Command) readConfig() *Config {
} }
keyfileLAN := filepath.Join(config.DataDir, serfLANKeyring) keyfileLAN := filepath.Join(config.DataDir, serfLANKeyring)
if _, err := os.Stat(keyfileLAN); err == nil { 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 { if config.Server {
keyfileWAN := filepath.Join(config.DataDir, serfWANKeyring) keyfileWAN := filepath.Join(config.DataDir, serfWANKeyring)
if _, err := os.Stat(keyfileWAN); err == nil { 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")
} }
} }
} }