luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #1080 from zendesk/master 

Return every time lock acquisition fails
This commit is contained in:
Armon Dadgar 2015-07-22 15:30:46 -07:00
parent 00691a0f02 eece6e4848
commit 2b93e5f52c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
command/lock.go
View File

@ -138,8 +138,12 @@ func (c *LockCommand) Run(args []string) int {
c.Ui.Info("Attempting lock acquisition") c.Ui.Info("Attempting lock acquisition")
} }
lockCh, err := lu.lockFn(c.ShutdownCh) lockCh, err := lu.lockFn(c.ShutdownCh)
if err != nil || lockCh == nil { if lockCh == nil {
c.Ui.Error(fmt.Sprintf("Lock acquisition failed: %s", err)) if err == nil {
c.Ui.Error("Shutdown triggered during lock acquisition")
} else {
c.Ui.Error(fmt.Sprintf("Lock acquisition failed: %s", err))
}
return 1 return 1
} }