bizside 3.1.9 → 3.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c76151e138a0f1eadb59b9dddeb067f8b0d7c3da54fc2a03d6001fb19c46268
-  data.tar.gz: aafaebaf044618b30cce606e8902b83304629139e9e5f674e99d5a221c5d1854
+  metadata.gz: 965259388007d23022ca99a2573016838c823e150dcf545d14572755546843f5
+  data.tar.gz: 993fff8959c443d2573a225c84743b8205c0a585dbca2a9d01c43900e6c32907
 SHA512:
-  metadata.gz: e90cd9c0e6e763c92618a0d364670e318a6c5a5f32282edbb28c6791f7f314a13d7f1aa278de0c824ffd647a8cf312a54290dec757f0f1c263a4531c653df6a3
-  data.tar.gz: a66f38120386e93ab5da5871f3f7b81640307981e7d1ff5ef4217c6eb40bc0586a5913ef5b079e8f915568a52d0cdbdf57715a0ede731e5b1b84da72d20a2800
+  metadata.gz: 7e5c8f7942f398a6111bee38988024fdc6ebb02b36f5d63a1d5f1b43984cfc64f5a2c8a6da9edb02dda72ed394464e10670604baec83a734e88cc80bc568083a
+  data.tar.gz: 614cd9b9aae077273ffb119d225ae2cd7d79fc23b127e5ac74f4290cb8dbb6879e7bca5c668733afb03e3b2521506ee1563135055b54a8c365dbaa20ab0c61b9

data/lib/bizside/job_utils.rb

@@ -109,26 +109,17 @@ module Bizside
     end
 
     # Resque.delayed? は @queue の定義がない場合に機能しないため、独自に実装
-    def self.delayed?(klass, args, except: [], grace_period: 5.0)
+    def self.delayed?(klass, args, except: [])
       args_to_check = args.with_indifferent_access.except(*Array(except))
-      now_f = Time.now.to_f
-  
-      delayed_queue_peek(0, delayed_queue_schedule_size).each do |timestamp|
-        delayed_timestamp_peek(timestamp, 0, delayed_timestamp_size(timestamp)).each do |job_info|
+
+      JobUtils.delayed_queue_peek(0, JobUtils.delayed_queue_schedule_size).each do |timestamp|
+        JobUtils.delayed_timestamp_peek(timestamp, 0, JobUtils.delayed_timestamp_size(timestamp)).each do |job_info|
           job_args = job_info['args'].first.presence || {}
           job_args = job_args.with_indifferent_access.except(*Array(except))
-          next unless job_info['class'] == klass.to_s && job_args == args_to_check
-                 
-          # 実行時刻と現在時刻の差が小さければキューイングを試行している自分自身とみなしてスキップ
-          # grace_period以内は実行直前と見なす
-          scheduled_at = timestamp.to_f
-          if (scheduled_at - now_f).abs < grace_period
-            Rails.logger.debug("[delayed?] skip duplicate-check for job scheduled_at=#{scheduled_at}, now=#{now_f}")
-            next
+          if job_info['class'] == klass.to_s && job_args == args_to_check
+            Rails.logger.info "遅延ジョブに #{job_info} がすでに登録されています。"
+            return true
           end
-  
-          Rails.logger.info "遅延ジョブに #{job_info} がすでに登録されています。"
-          return true
         end
       end
 

data/lib/bizside/version.rb

@@ -1,3 +1,3 @@
 module Bizside
-  VERSION = '3.1.9'
+  VERSION = '3.1.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.1.10
 platform: ruby
 authors:
 - bizside-developers
@@ -564,7 +564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.22
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.