gitlab-artifacts-cleaner 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e27c50f5dd4314993220769dc0c1a6fb5e258d5528a0aa23a5fffb84f156add7
-  data.tar.gz: d65abedffe73ba14f5de8f8cdf682e0bc4c1dd7472b702f3716abbad1ab3f844
+  metadata.gz: 3437574a027a10ec61c3cca564a5715c09115779737f36a3c46a71ed23f0f3f3
+  data.tar.gz: e106c373eff8db67d281ba6ad53137f725ee8b6fe64680e824e518a9d96db27e
 SHA512:
-  metadata.gz: fea481a000a060b8a330fc81d2313f52ffff9fdc75b8774dee094c5c42751a9baafa7cf6ef82f77f031742a1e62af1d6f09cf62747c9efb9c04b3c4a0a93b4a2
-  data.tar.gz: 40571059f576c739dcdd1ac8118813345c379e5e50bc51b5a41dd9fa1472fca4520d56f6da1d9c1b328e7942d7febecd37450344ef6ec2b891c89f22b9f9d405
+  metadata.gz: 13dd3c644076bac367478b9c4358ac69eb9555d7dbce00dc31124a446df7c434a0b217020d36fd0b47499f40a4de0c88bbb0d7cacedfb17f97995c1468f606f7
+  data.tar.gz: 1eec5896149fd2d8750e26228cccfa071f8a2b1df06dcb17f63b9b3ba9624d68595614ae76a6931aac1749f413f8f2bfcf0ce24fc83ec1967a8a58977bd7a561

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    gitlab-artifacts-cleaner (0.1.0)
+    gitlab-artifacts-cleaner (0.1.3)
+      httparty (~> 0.17.1)
 
 GEM
   remote: https://rubygems.org/
@@ -35,7 +36,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.17)
   gitlab-artifacts-cleaner!
-  httparty (~> 0.17.1)
   rake (~> 10.0)
   rspec (~> 3.0)
 

data/lib/gitlab/artifacts/cleaner.rb

@@ -14,17 +14,20 @@ module Gitlab
 
         raise 'Insufficient arguments' unless @api_route && @priavte_token && @older_than
 
-        while jobs = get_job_list!
+        while jobs = safe_get_job_list
           puts "@current_page: #{@current_page}"
 
           old_jobs = jobs.select { |job| Time.parse(job['created_at']) < @older_than }
 
           old_jobs.each do |job|
             job_id = job['id']
-            puts "job_id: #{job_id} message: deleting job artifacts"
-            delete_job_artifact!(job_id)
-            puts "job_id: #{job_id} message: deleted job artifacts"
-            @total_count += 1
+            begin
+              delete_job_artifact!(job_id)
+              puts "job_id: #{job_id} message: deleted job artifacts"
+              @total_count += 1
+            rescue => e
+              puts "job_id: #{job_id} message: #{e.message}"
+            end
           end
         end
 
@@ -37,6 +40,14 @@ module Gitlab
         @current_page > @total_page
       end
 
+      def safe_get_job_list
+        retries ||= 0
+        get_job_list!
+      rescue => e
+        sleep 10
+        retry if (retries += 1) < 10
+      end
+
       def get_job_list!
         response = ::HTTParty.get(job_index_api, headers: headers, query: query)
 

data/lib/gitlab/artifacts/cleaner/version.rb

@@ -1,7 +1,7 @@
 module Gitlab
   module Artifacts
     module Cleaner
-      VERSION = "0.1.2"
+      VERSION = "0.1.3"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-artifacts-cleaner
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Shinya Maeda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler