bizside 3.1.8 → 3.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 07c4d077d46e0d04a438967f7888e42fb6326fb6de060f9d6db88ae4b6e77401
4
- data.tar.gz: 976572cf3000b776275c9f196454f4d5077490caa968a8eaaff8c63d74bb066e
3
+ metadata.gz: 5c76151e138a0f1eadb59b9dddeb067f8b0d7c3da54fc2a03d6001fb19c46268
4
+ data.tar.gz: aafaebaf044618b30cce606e8902b83304629139e9e5f674e99d5a221c5d1854
5
5
  SHA512:
6
- metadata.gz: 28b9665da24bb988c19b0e993e75b1ffb5968fe4f2af4be0db3d88eb44a4d745a22196733ad771892c24ce8530b95f291c86f05d6d70981b98c8e1e4d4567704
7
- data.tar.gz: 584b928c657ddee2e08f76113dcd03644cb4f90dec300b68313d9d98833a20fd974e25c7e30f73bd85b836fe9aa32537796c95ca2498d3aad270292b66b1923d
6
+ metadata.gz: e90cd9c0e6e763c92618a0d364670e318a6c5a5f32282edbb28c6791f7f314a13d7f1aa278de0c824ffd647a8cf312a54290dec757f0f1c263a4531c653df6a3
7
+ data.tar.gz: a66f38120386e93ab5da5871f3f7b81640307981e7d1ff5ef4217c6eb40bc0586a5913ef5b079e8f915568a52d0cdbdf57715a0ede731e5b1b84da72d20a2800
@@ -109,17 +109,26 @@ module Bizside
109
109
  end
110
110
 
111
111
  # Resque.delayed? は @queue の定義がない場合に機能しないため、独自に実装
112
- def self.delayed?(klass, args, except: [])
112
+ def self.delayed?(klass, args, except: [], grace_period: 5.0)
113
113
  args_to_check = args.with_indifferent_access.except(*Array(except))
114
-
115
- JobUtils.delayed_queue_peek(0, JobUtils.delayed_queue_schedule_size).each do |timestamp|
116
- JobUtils.delayed_timestamp_peek(timestamp, 0, JobUtils.delayed_timestamp_size(timestamp)).each do |job_info|
114
+ now_f = Time.now.to_f
115
+
116
+ delayed_queue_peek(0, delayed_queue_schedule_size).each do |timestamp|
117
+ delayed_timestamp_peek(timestamp, 0, delayed_timestamp_size(timestamp)).each do |job_info|
117
118
  job_args = job_info['args'].first.presence || {}
118
119
  job_args = job_args.with_indifferent_access.except(*Array(except))
119
- if job_info['class'] == klass.to_s && job_args == args_to_check
120
- Rails.logger.info "遅延ジョブに #{job_info} がすでに登録されています。"
121
- return true
120
+ next unless job_info['class'] == klass.to_s && job_args == args_to_check
121
+
122
+ # 実行時刻と現在時刻の差が小さければキューイングを試行している自分自身とみなしてスキップ
123
+ # grace_period以内は実行直前と見なす
124
+ scheduled_at = timestamp.to_f
125
+ if (scheduled_at - now_f).abs < grace_period
126
+ Rails.logger.debug("[delayed?] skip duplicate-check for job scheduled_at=#{scheduled_at}, now=#{now_f}")
127
+ next
122
128
  end
129
+
130
+ Rails.logger.info "遅延ジョブに #{job_info} がすでに登録されています。"
131
+ return true
123
132
  end
124
133
  end
125
134
 
@@ -1,3 +1,3 @@
1
1
  module Bizside
2
- VERSION = '3.1.8'
2
+ VERSION = '3.1.9'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bizside
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.8
4
+ version: 3.1.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - bizside-developers
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2026-06-22 00:00:00.000000000 Z
11
+ date: 2026-07-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport