docker-registry-sync 0.2.8 → 0.2.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTE2MzA1NjZmNTUzYWUzY2M3ZmEyNDM0N2RjODZlMDVjMDkyZTI2MA==
+    MTFmYmM3YTUyNzBlZWU1NTYzNWJmOTlkMWM3MmE4NGFmYzQzMTcxYw==
   data.tar.gz: !binary |-
-    ZDA3NTIyMmY5MzBmYjYxNDc2ZmFjN2Q5NmZlMWVkZThkMGY2MTJkOA==
+    ZTA1MjY5Mjk4ZDRmY2FjNzllNDhiZmI2ZWQwMGU3OWU5MDM5NzZhYw==
 SHA512:
   metadata.gz: !binary |-
-    NzQzZmM4YzkyODliNTE2OGUzNjliYzQwNGZhNWI2ZTgwMDAwM2M3ZDZiMzhi
-    ZTdiZTk2NTc3YTg3NzI3Nzg5YTk3NzAzNzFhYTI3YzUxMTAzOTg5NmM2NTJm
-    NzkxN2JkYmZjNDUxMzcxYTc2ODU5Y2E4NGIwZmMzMTJlOTExMDg=
+    Njk5YmU1MTY0MDFiMzMwNjU2NDI5ZWQzM2I2Mzc4YmIxNWQ2ODE4NDRmYTc1
+    NWI1NDk2YmYyMTI4OGZjZDAwMWJhMTkzYWQ4ZTYwZmEwMWRiZDE1MzBiNjNm
+    MzAwMThkN2NjNjViZDE1MTM3ZGEwNDJjYjdkNjRlZTE3M2U5YzA=
   data.tar.gz: !binary |-
-    M2EyNGM3ZjE1M2ExOWYzZWVkMWY1MzU4YjQ4NDY2MzYwN2E5N2EzNDg4ZGEx
-    MjkxZDUyOGU0ZTM3OGE0MzRiM2QyNTJiMTU0MTc1YTUzMDEwMWQ2NWVmMzgx
-    M2YxNjE5M2QyZDMwNTY4MDFhYmZmMmQ0ZTRmZDcyMjc4NzdhYmE=
+    NDViMDc2MjA2NmE3NzJkYzhiOTFlZmVlYTUyMWViZGY2NzBlZTQ1NjE2MWM2
+    Nzc3ZWZjZjFmNDk4ZWI3YWUzOWE0NGZhNmUwZTlhNDI2OWYxMTJhNzUxY2M3
+    MGQwZDM1Mzg3ZDI4OWE4NmIxNGQyY2FiYWZiZTRhZjZkNGY5ZDM=

data/lib/docker/registry/sync/cmd.rb

@@ -52,11 +52,13 @@ module Docker
               @config.logger.error 'Received INT signal...'
               @producer_finished = true
               @terminated = true
+              @work_queue.clear
             end
             Signal.trap('TERM') do
               @config.logger.error 'Received TERM signal...'
               @producer_finished = true
               @terminated = true
+              @work_queue.clear
             end
           end
 
@@ -171,7 +173,7 @@ module Docker
               end
               ec = 0
               sleep @config.empty_queue_sleep_time unless @terminated
-            rescue Exception => e
+            rescue => e
               @config.logger.error "An unknown error occurred while monitoring queue: #{e}"
               @config.logger.error e.traceback
               @config.logger.error 'Exiting...'

data/lib/docker/registry/sync/s3.rb

@@ -34,7 +34,7 @@ module Docker
 
               img_id = s3_source.get_object(bucket: source_bucket, key: "registry/repositories/#{image}/tag_#{tag}").body.read
               sync_image(img_id, bucket, region, sse, source_bucket, source_region)
-            rescue Exception => e
+            rescue => e
               @config.logger.error "An unexpected error occoured while syncing tag #{image}:#{tag}: #{e}"
               @config.logger.error e.backtrace
               false
@@ -57,7 +57,7 @@ module Docker
               JSON.load(img_index_resp.body.read).each do |image|
                 sync_image(image['id'], bucket, region, sse, source_bucket, source_region)
               end
-            rescue Exception => e
+            rescue => e
               @config.logger.error "An unexpected error occoured while syncing repo #{repo}: #{e}"
               @config.logger.error e.backtrace
               false
@@ -147,15 +147,16 @@ module Docker
                     begin
                       target_client.copy_object(opts)
                       success = true
-                    rescue Exception => e
+                      @config.logger.info "Worker finished syncing key: #{opts[:key]}"
+                    rescue => e
                       @config.logger.error "An unknown error occoured while copying object in s3: #{e}"
                       @config.logger.error e.backtrace
+                    ensure
+                      Thread.current['finished'] = true
+                      @threads.synchronize do
+                        @status_queue << success
+                      end
                     end
-                    Thread.current['finished'] = true
-                    @threads.synchronize do
-                      @status_queue << success
-                    end
-                    @config.logger.info "Worker finished syncing key: #{opts[:key]}"
                   end
                 else
                   @config.logger.info "Queued work empty: #{opts}"

data/lib/docker/registry/sync/version.rb

@@ -1,7 +1,7 @@
 module Docker
   module Registry
     module Sync
-      VERSION = '0.2.8'
+      VERSION = '0.2.9'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-registry-sync
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Brian Oldfield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler