dash 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c3e7210d642d1f0fc0d9a414cdf74a0c4a1ec9e09cf2f534c1cb1f6b02342a5
-  data.tar.gz: d91f21902a85f56d76bfde689a75d6c3d5b10aa587138de732943e3a0015433d
+  metadata.gz: f5065b1c8a366e822c1a5725f6695e7a3c331fcc463f46468fbe4fee20d78849
+  data.tar.gz: 771148010423f80ae9be75786e72ea16c04ed42aed1df9299d7bbf8964f5576a
 SHA512:
-  metadata.gz: e62792a82328365e87efd4428cfab12808281fc617157f8699e757962b742988560ff66ebdd0c5fa7f36f6071b1a46441284038c442e74724ec0b1caa354f5c9
-  data.tar.gz: f328a6e03c4d302170ad406a6550ddd95987622b26af74442945b25cec44081074b995a633b97f546bb873b97e3b9b3905c78973526698a5e0dd4d5635f6dd13
+  metadata.gz: 9d2331591dddd15a2b4dfebe431140f1a8b514060478160c306af84474183792097abf2ac23f90f025ee13ab4e218fdeb552273ac22bfb59853ab21e1e9d83dd
+  data.tar.gz: 45f79aa83398b76497eedb2b39fc66bbc9c28ef3beb3934ed8701dda2236e746f288645a8355c0e3a7c3091eb3189eb4b236122d27b8c5ceb36a0bb31c756b4b

data/lib/kamal/cli/base.rb

@@ -180,6 +180,8 @@ module Kamal::Cli
 
         say "Acquiring the server lock...", :magenta
 
+        retried_after_release = false
+
         loop do
           held = []
 
@@ -194,9 +196,24 @@ module Kamal::Cli
             release_server_lock_on(held)
 
             unless details_shown
-              say "Server lock is held by:", :magenta
-              puts capture_lock_status(lock: KAMAL.server_lock, hosts: server_lock_hosts.first)
-              details_shown = true
+              # The holder can release between our failed mkdir and this read.
+              # That means the lock is free, not that anything went wrong, so
+              # it must never escape as LockMissingError and fail the deploy.
+              status = begin
+                capture_lock_status(lock: KAMAL.server_lock, hosts: server_lock_hosts.first)
+              rescue LockMissingError
+                nil
+              end
+
+              if status
+                say "Server lock is held by:", :magenta
+                puts status
+                details_shown = true
+              elsif !retried_after_release
+                # Gone already — take one immediate run at it before backing off.
+                retried_after_release = true
+                next
+              end
             end
 
             remaining = (deadline - Time.now).to_i

data/lib/kamal/version.rb

@@ -1,3 +1,3 @@
 module Kamal
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dash
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Mikael Henriksson