ci-queue 0.24.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f51b9eaf62e347a724e6e1fc533c26d504cca7922a4296b750ae2599c7cfa6e
-  data.tar.gz: 0b9833d46d95e90d67663a2ff5bea2a8ad17c781b812a9f8b4ec7485bf0789d0
+  metadata.gz: 2dddff029008b5dbe7ff19995f824f6c1d54a19e699377742a6e4599642f4b55
+  data.tar.gz: 9ff1268a7be473c4f35cb907193b24e04ae22189df0c116be9cc09db50112925
 SHA512:
-  metadata.gz: b627008782774ad37ae5dbd5a2db0ae24df1f3fcda1dae9e0c0064f7c8df7890b926734855fd0f35d440e5e03d25441b6b9dc60c48bcaa19b8c5537c5d33c98b
-  data.tar.gz: e3d1c41abfe02341deb545fda1e6eebb94826801ca104788d2aa48fab1886e6093acd402ef097f58c6b2bc4f403568386e45d1b8032f1323d4f7cfbf6f7f381b
+  metadata.gz: 755d03be6402d76d3d225c5c4dae6dafdf60f604fb6377c48403f98898b6ee6bc44634ad8d5dfdafe15f9ca2e3b8e304244850984f75aed67ae872064e9caedf
+  data.tar.gz: 157c12e846214542d78116fa168e380eba0b9266bcd2f3194d28c55951cc9c11cbc015582654ad6dfe09fac852e1123f3b9bbd8cd5b936ecdbf4075ce6a06784

data/lib/ci/queue/redis/base.rb

@@ -22,7 +22,7 @@ module CI
         end
 
         def expired?
-          if (created_at = redis.get(key('master-created-at')))
+          if (created_at = redis.get(key('created-at')))
             (created_at.to_f + config.redis_ttl + TEN_MINUTES) < Time.now.to_f
           else
             # if there is no created at set anymore we assume queue is expired
@@ -30,6 +30,10 @@ module CI
           end
         end
 
+        def created_at=(timestamp)
+          redis.setnx(key('created-at'), timestamp)
+        end
+
         def size
           redis.multi do |transaction|
             transaction.llen(key('queue'))
@@ -71,6 +75,10 @@ module CI
           end
         end
 
+        def queue_initializing?
+          master_status == 'setup'
+        end
+
         def increment_test_failed
           redis.incr(key('test_failed_count'))
         end

data/lib/ci/queue/redis/worker.rb

@@ -202,12 +202,10 @@ module CI
               transaction.lpush(key('queue'), tests) unless tests.empty?
               transaction.set(key('total'), @total)
               transaction.set(key('master-status'), 'ready')
-              transaction.set(key('master-created-at'), Time.now.to_f)
 
               transaction.expire(key('queue'), config.redis_ttl)
               transaction.expire(key('total'), config.redis_ttl)
               transaction.expire(key('master-status'), config.redis_ttl)
-              transaction.expire(key('master-created-at'), config.redis_ttl)
             end
           end
           register

data/lib/ci/queue/static.rb

@@ -11,6 +11,8 @@ module CI
         end
       end
 
+      TEN_MINUTES = 60 * 10
+
       attr_reader :progress, :total
 
       def initialize(tests, config)
@@ -37,6 +39,14 @@ module CI
         self
       end
 
+      def created_at=(timestamp)
+        @created_at ||= timestamp
+      end
+
+      def expired?
+        (@created_at.to_f TEN_MINUTES) < Time.now.to_f
+      end
+
       def populated?
         !!defined?(@index)
       end

data/lib/ci/queue/version.rb

@@ -2,7 +2,7 @@
 
 module CI
   module Queue
-    VERSION = '0.24.0'
+    VERSION = '0.24.1'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

data/lib/minitest/queue/runner.rb

@@ -61,6 +61,8 @@ module Minitest
           end
         end
 
+        queue.rescue_connection_errors { queue.created_at = Time.now.to_f }
+
         set_load_path
         Minitest.queue = queue
         reporters = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler