Merge pull request #1080 from zendesk/master

Return every time lock acquisition fails
9 years ago · cfa7ed71a7
parent 3e9e575dee f877b9ecc4
commit cfa7ed71a7
1 changed files with 6 additions and 2 deletions
--- a/command/lock.go
+++ b/command/lock.go
@ -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
 	}