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

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '09ca6576d408e4ffb2c198ac9d52e2c3a81c6b662dad3df1b0d9e98ac80623c7'
4
- data.tar.gz: e7b8b1ca5df64775cea50c2925bdf7f13202ff52d991387cac0782996c0c8b78
3
+ metadata.gz: 64a940f929792ef7097c9833c41692f970f42aa1943020468147d9960ab88edb
4
+ data.tar.gz: 6ec72dd113fa7cfdaaf04223e7f85c23d4b2b0a4e61a7a7edf04ca34727cad78
5
5
  SHA512:
6
- metadata.gz: 49ca0f3c578e37f205d09a6aa6e21cfaddeb92bde7f04ba1c65079bd415944e40fa6123d76bea7486f2968125dd939425824f329dd3c9eac743d2cd6ea93eaf1
7
- data.tar.gz: 6b2324e126a0e598334ae53fa5de05d6eddd06148ff6e61947ddc291f1854041bf5e2ca0bfe4e91a9b408ff47fa04a1f4cbefcd6875c7f9fea23584e40e5934a
6
+ metadata.gz: 531da15da212e104d6a3702cd522ce6c5e4b6718dc5d79773dc5ed409973b40913735dc42bb81a7b9407db07b84692ded0e8f16f59bc1967964438d314e551c3
7
+ data.tar.gz: ec1259ba39dae97af68702687459fa3b16629444724a785dcd17721fe5f6032d0ab296e000c70d6cad7a788463b8094c13201e9ca2ed401eed029f8c2bfee182
data/lib/deb/s3/cli.rb CHANGED
@@ -242,13 +242,17 @@ class Deb::S3::CLI < Thor
242
242
  log("Uploading packages and new manifests to S3")
243
243
  manifests.each_value do |manifest|
244
244
  begin
245
- manifest.write_to_s3 { |f| sublog("Transferring #{f}") }
245
+ manifest.write_to_s3 do |f|
246
+ sublog("Transferring #{f} at #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}")
247
+ end
246
248
  rescue Deb::S3::Utils::AlreadyExistsError => e
247
249
  error("Uploading manifest failed because: #{e}")
248
250
  end
249
251
  release.update_manifest(manifest)
250
252
  end
251
- release.write_to_s3 { |f| sublog("Transferring #{f}") }
253
+ release.write_to_s3 do |f|
254
+ sublog("Transferring #{f} at #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}")
255
+ end
252
256
 
253
257
  log("Update complete.")
254
258
  ensure
data/lib/deb/s3/lock.rb CHANGED
@@ -4,7 +4,7 @@ require "etc"
4
4
 
5
5
  class Deb::S3::Lock
6
6
  attr_reader :user, :host_with_uuid
7
-
7
+
8
8
  DYNAMODB_TABLE_NAME = 'deb-s3-lock'
9
9
 
10
10
  def initialize(user, host_with_uuid)
@@ -35,6 +35,8 @@ class Deb::S3::Lock
35
35
  lock_body = "#{Etc.getlogin}@#{Socket.gethostname}-#{uuid}"
36
36
  lock_key = codename
37
37
 
38
+ $stderr.puts("Current job's hostname with UUID: #{lock_body}")
39
+
38
40
  max_attempts.times do |i|
39
41
  wait_interval = [2**i, max_wait_interval].min
40
42
 
@@ -54,13 +56,10 @@ class Deb::S3::Lock
54
56
  $stderr.puts("[#{current_time}] Repository is locked by another user: #{lock_holder.user} at host #{lock_holder.host_with_uuid}")
55
57
  $stderr.puts("Attempting to obtain a lock after #{wait_interval} second(s).")
56
58
  sleep(wait_interval)
57
- rescue => e
58
- $stderr.puts("Unexpected error: #{e.message}")
59
- sleep(wait_interval)
60
59
  end
61
60
  end
62
61
 
63
- raise "Unable to obtain a lock after #{max_attempts}, giving up."
62
+ raise "Unable to obtain a lock after #{max_attempts} attemtps, giving up."
64
63
  end
65
64
 
66
65
  def unlock(codename)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: deb-s3-lock-fix
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.8.fix5
4
+ version: 0.11.8.fix7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Braeden Wolf & Ken Robertson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-09-14 00:00:00.000000000 Z
11
+ date: 2023-09-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor