status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-22 11:40:06 +00:00
Code Issues Projects Releases Wiki Activity

Return every time lock acquisition fails

Browse Source
This commit is contained in:
Benjamin Abbott-Scott 2015-07-04 03:48:17 -07:00
parent c34bcb45c6
commit f877b9ecc4
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")
}
lockCh, err := lu.lockFn(c.ShutdownCh)
if err != nil || lockCh == nil {
c.Ui.Error(fmt.Sprintf("Lock acquisition failed: %s", err))
if lockCh == nil {
if err == nil {
c.Ui.Error("Shutdown triggered during lock acquisition")
} else {
c.Ui.Error(fmt.Sprintf("Lock acquisition failed: %s", err))
}
return 1
}