bizside 3.1.7 → 3.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '084ffb2e7920756a781c60818984e9dc87a8219c0a6f4cdf33fd047f1616d6f8'
-  data.tar.gz: 82ad6f8e047363e0a35305773735db9ca929182a0500a4763637b175739b2978
+  metadata.gz: 5c76151e138a0f1eadb59b9dddeb067f8b0d7c3da54fc2a03d6001fb19c46268
+  data.tar.gz: aafaebaf044618b30cce606e8902b83304629139e9e5f674e99d5a221c5d1854
 SHA512:
-  metadata.gz: b55d9ce4a1b665140ce64a8828a685bc89254c51e705613dd0726083ebfa832e371383e0b9a7784f76f8bdf66f48458d982f2fcbf19474134d1c86f53de8bf24
-  data.tar.gz: abc75a23b2b816f9bd825facf98faa48cf066fde88acb64afff6edcc00c17017e798cb17ad6b02f34212179030350fe0cffaedaa703881b0d11540af1f7c37ef
+  metadata.gz: e90cd9c0e6e763c92618a0d364670e318a6c5a5f32282edbb28c6791f7f314a13d7f1aa278de0c824ffd647a8cf312a54290dec757f0f1c263a4531c653df6a3
+  data.tar.gz: a66f38120386e93ab5da5871f3f7b81640307981e7d1ff5ef4217c6eb40bc0586a5913ef5b079e8f915568a52d0cdbdf57715a0ede731e5b1b84da72d20a2800

data/lib/bizside/job_utils.rb

@@ -109,17 +109,26 @@ module Bizside
     end
 
     # Resque.delayed? は @queue の定義がない場合に機能しないため、独自に実装
-    def self.delayed?(klass, args, except: [])
+    def self.delayed?(klass, args, except: [], grace_period: 5.0)
       args_to_check = args.with_indifferent_access.except(*Array(except))
-
-      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|
+      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|
           job_args = job_info['args'].first.presence || {}
           job_args = job_args.with_indifferent_access.except(*Array(except))
-          if job_info['class'] == klass.to_s && job_args == args_to_check
-            Rails.logger.info "遅延ジョブに #{job_info} がすでに登録されています。"
-            return true
+          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
           end
+  
+          Rails.logger.info "遅延ジョブに #{job_info} がすでに登録されています。"
+          return true
         end
       end
 

data/lib/bizside/resque.rb

@@ -10,6 +10,8 @@ require 'resque/failure/multiple'
 require 'resque/failure/redis'
 require_relative 'audit/job_logger'
 
+require 'socket'
+
 {
   yaml: ['config/resque.yml', 'config/redis.yml'],
   json: ['config/resque.json', 'config/redis.json']
@@ -158,7 +160,17 @@ module Resque
       # * hostname(1) は Linux Standard Base 共通コマンドのため必ず存在する。
       #   @see https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Common/LSB-Common/rcommands.html
       def hostname
-        @hostname ||= (`hostname`.chomp rescue '(unknown)')
+        return @hostname if defined?(@hostname) && @hostname && !@hostname.to_s.empty?
+      
+        @hostname ||= begin
+            n = (Socket.gethostname rescue nil).to_s
+            n = nil if n.empty?
+            if n.nil?
+            n = (`hostname`.to_s.strip rescue nil)
+            n = nil if n && n.empty?
+            end
+            n || '(unknown)'
+        end
       end
 
     end
@@ -186,7 +198,16 @@ if defined? Resque::Scheduler
             "#{Array(exception.backtrace).join("\n")}"
           ].join("\n")
 
-          @hostname ||= (`hostname`.chomp rescue '(unknown)')
+          @hostname ||= begin
+            n = (Socket.gethostname rescue nil).to_s
+            n = nil if n.empty?
+            if n.nil?
+              n = (`hostname`.to_s.strip rescue nil)
+              n = nil if n && n.empty?
+            end
+            n || '(unknown)'
+          end
+
           info = {
             time: Time.now.strftime('%Y-%m-%dT%H:%M:%S.%3N%z'),
             env: ENV['X-BIZSIDE-ENV'].presence || ENV['RAILS_ENV'],

data/lib/bizside/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bizside
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.9
 platform: ruby
 authors:
 - bizside-developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-06-03 00:00:00.000000000 Z
+date: 2026-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -564,7 +564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Bizside is an utilities for web application.