scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 19:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not fail if api_addr and cluster_addr are empty (#4286)

Browse Source
This commit is contained in:
Calvin Leung Huang
2018-04-05 12:54:15 -04:00
committed by Jeff Mitchell
parent e2bb2ec3b9
commit 059493b587
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
command/server.go
View File

@@ -597,7 +597,7 @@ func (c *ServerCommand) Run(args []string) int {
CLUSTER_SYNTHESIS_COMPLETE: CLUSTER_SYNTHESIS_COMPLETE:
if coreConfig.RedirectAddr == coreConfig.ClusterAddr { if coreConfig.RedirectAddr == coreConfig.ClusterAddr && len(coreConfig.RedirectAddr) != 0 {
c.UI.Error(fmt.Sprintf( c.UI.Error(fmt.Sprintf(
"Address %q used for both API and cluster addresses", coreConfig.RedirectAddr)) "Address %q used for both API and cluster addresses", coreConfig.RedirectAddr))
return 1 return 1

3
command/server_test.go
View File

@@ -147,7 +147,8 @@ func TestServer_ReloadListener(t *testing.T) {
args := []string{"-config", td + "/reload.hcl"} args := []string{"-config", td + "/reload.hcl"}
go func() { go func() {
if code := cmd.Run(args); code != 0 { if code := cmd.Run(args); code != 0 {
t.Error("got a non-zero exit status") output := ui.ErrorWriter.String() + ui.OutputWriter.String()
t.Errorf("got a non-zero exit status: %s", output)
} }
finishedMutex.Lock() finishedMutex.Lock()
finished = true finished = true