deb-s3-lock-fix 0.11.8.fix5 → 0.11.8.fix7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09ca6576d408e4ffb2c198ac9d52e2c3a81c6b662dad3df1b0d9e98ac80623c7'
-  data.tar.gz: e7b8b1ca5df64775cea50c2925bdf7f13202ff52d991387cac0782996c0c8b78
+  metadata.gz: 64a940f929792ef7097c9833c41692f970f42aa1943020468147d9960ab88edb
+  data.tar.gz: 6ec72dd113fa7cfdaaf04223e7f85c23d4b2b0a4e61a7a7edf04ca34727cad78
 SHA512:
-  metadata.gz: 49ca0f3c578e37f205d09a6aa6e21cfaddeb92bde7f04ba1c65079bd415944e40fa6123d76bea7486f2968125dd939425824f329dd3c9eac743d2cd6ea93eaf1
-  data.tar.gz: 6b2324e126a0e598334ae53fa5de05d6eddd06148ff6e61947ddc291f1854041bf5e2ca0bfe4e91a9b408ff47fa04a1f4cbefcd6875c7f9fea23584e40e5934a
+  metadata.gz: 531da15da212e104d6a3702cd522ce6c5e4b6718dc5d79773dc5ed409973b40913735dc42bb81a7b9407db07b84692ded0e8f16f59bc1967964438d314e551c3
+  data.tar.gz: ec1259ba39dae97af68702687459fa3b16629444724a785dcd17721fe5f6032d0ab296e000c70d6cad7a788463b8094c13201e9ca2ed401eed029f8c2bfee182

data/lib/deb/s3/cli.rb

@@ -242,13 +242,17 @@ class Deb::S3::CLI < Thor
       log("Uploading packages and new manifests to S3")
       manifests.each_value do |manifest|
         begin
-          manifest.write_to_s3 { |f| sublog("Transferring #{f}") }
+          manifest.write_to_s3 do |f|
+            sublog("Transferring #{f} at #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}")
+          end
         rescue Deb::S3::Utils::AlreadyExistsError => e
           error("Uploading manifest failed because: #{e}")
         end
         release.update_manifest(manifest)
       end
-      release.write_to_s3 { |f| sublog("Transferring #{f}") }
+      release.write_to_s3 do |f|
+        sublog("Transferring #{f} at #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}")
+      end
 
       log("Update complete.")
     ensure

data/lib/deb/s3/lock.rb

@@ -4,7 +4,7 @@ require "etc"
 
 class Deb::S3::Lock
   attr_reader :user, :host_with_uuid
-  
+
   DYNAMODB_TABLE_NAME = 'deb-s3-lock'
 
   def initialize(user, host_with_uuid)
@@ -35,6 +35,8 @@ class Deb::S3::Lock
       lock_body = "#{Etc.getlogin}@#{Socket.gethostname}-#{uuid}"
       lock_key = codename
 
+      $stderr.puts("Current job's hostname with UUID: #{lock_body}")
+
       max_attempts.times do |i|
         wait_interval = [2**i, max_wait_interval].min
 
@@ -54,13 +56,10 @@ class Deb::S3::Lock
           $stderr.puts("[#{current_time}] Repository is locked by another user: #{lock_holder.user} at host #{lock_holder.host_with_uuid}")
           $stderr.puts("Attempting to obtain a lock after #{wait_interval} second(s).")
           sleep(wait_interval)
-        rescue => e
-          $stderr.puts("Unexpected error: #{e.message}")
-          sleep(wait_interval)
         end
       end
 
-      raise "Unable to obtain a lock after #{max_attempts}, giving up."
+      raise "Unable to obtain a lock after #{max_attempts} attemtps, giving up."
     end
 
     def unlock(codename)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3-lock-fix
 version: !ruby/object:Gem::Version
-  version: 0.11.8.fix5
+  version: 0.11.8.fix7
 platform: ruby
 authors:
 - Braeden Wolf & Ken Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor