skiplock 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20d942af62acf618cbb7d7baeaf3d2f0404aac8cf012c255c8806ddbe5d23fd9
-  data.tar.gz: 7383cfaf4f4a15b0cb9fe8a55bca896b72bcb3c728684aa4e60cc876be67d97e
+  metadata.gz: 251899d30b6c22a82be564d61da33bca7734fd67516eec5d6cc122ebde93ccaa
+  data.tar.gz: fa090c287d2f3fcbe03a45a324832d4d5a1fa800e26c26deb40091789c712df5
 SHA512:
-  metadata.gz: 487fc69ce0ff35ed020c2c0d0823303743d86afd1acd9a18d2399602afcb34f15e1f8215a10f65fafdcf10f9a3982fe8c76cb2df3043dff5ee6562f2379dfd03
-  data.tar.gz: e71774849db02070c6690d76818f22d693dc7531d3e9ca09710a8768359bdda857edf734f0f86d386e03098d1c66991aae6c7d4b91c2398b7135dc9dc4f25980
+  metadata.gz: bd62845a436ea37e27da889beecec6f2b16b4d3be745c3d336da4a3a9aacf34867e586e9ecb186e816e9784969dfee754d1fccb3e0ba8dedb8d63fada1eb9304
+  data.tar.gz: ef58e25457ac5ef98c385d122ca3252b161ddf62a589cfefb04286aaec5c2def0f52b6b334e554e8451adfe044f7be7c010a00d9c42a801731e6a7a6b3c5836d

data/lib/skiplock/job.rb

@@ -44,7 +44,7 @@ module Skiplock
       Dir.glob('tmp/skiplock/*').each do |f|
         disposed = true
         if self.exists?(id: File.basename(f), running: true)
-          job = YAML.load_file(f) rescue nil
+          job = YAML.respond_to?(:unsafe_load_file) ? YAML.unsafe_load_file(f) : YAML.load_file(f)
           disposed = job.dispose if job.is_a?(Skiplock::Job)
         end
         (File.delete(f) rescue nil) if disposed
@@ -116,8 +116,9 @@ module Skiplock
       self.max_retries = (self.data['options'].key?('max_retries') ? self.data['options']['max_retries'].to_i : max_retries) rescue max_retries
       self.max_retries = 20 if self.max_retries < 0 || self.max_retries > 20
       self.purge = (self.data['options'].key?('purge') ? self.data['options']['purge'] : purge_completion) rescue purge_completion
-      job_data = { 'job_class' => self.job_class, 'queue_name' => self.queue_name, 'locale' => self.locale, 'timezone' => self.timezone, 'priority' => self.priority, 'executions' => self.executions, 'exception_executions' => self.exception_executions.dup, 'job_id' => self.id, 'enqueued_at' => self.updated_at, 'arguments' => (self.data['arguments'] || []) }
+      job_data = { 'job_class' => self.job_class, 'queue_name' => self.queue_name, 'locale' => self.locale, 'timezone' => self.timezone, 'priority' => self.priority, 'executions' => self.executions, 'exception_executions' => self.exception_executions.dup, 'job_id' => self.id, 'enqueued_at' => self.updated_at.iso8601, 'arguments' => (self.data['arguments'] || []) }
       self.executions = self.executions.to_i + 1
+      self.data_will_change!
       Thread.current[:skiplock_job] = self
       start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       begin

data/lib/skiplock/manager.rb

@@ -141,17 +141,29 @@ module Skiplock
 
     def setup_logger
       @config[:loglevel] = 'info' unless ['debug','info','warn','error','fatal','unknown'].include?(@config[:loglevel].to_s)
-      @logger = ActiveSupport::Logger.new(STDOUT)
+      if defined?(ActiveSupport::BroadcastLogger)
+        @logger = ActiveSupport::BroadcastLogger.new(::Logger.new(STDOUT))
+      else
+        @logger = ActiveSupport::Logger.new(STDOUT)
+      end
       @logger.level = @config[:loglevel].to_sym
       Skiplock.logger = @logger
       if @config[:logfile].to_s.length > 0
-        @logger.extend(ActiveSupport::Logger.broadcast(::Logger.new(File.join(Rails.root, 'log', @config[:logfile].to_s), 'daily')))
+        if defined?(ActiveSupport::BroadcastLogger)
+          @logger.broadcast_to(::Logger.new(File.join(Rails.root, 'log', @config[:logfile].to_s), 'daily'))
+        else
+          @logger.extend(ActiveSupport::Logger.broadcast(::Logger.new(File.join(Rails.root, 'log', @config[:logfile].to_s), 'daily')))
+        end
         ActiveJob::Base.logger = nil
       end
       if @config[:standalone]
-        Rails.logger.reopen('/dev/null') rescue Rails.logger.reopen('NUL') # supports Windows NUL device
-        Rails.logger.level = @logger.level
-        Rails.logger.extend(ActiveSupport::Logger.broadcast(@logger))
+        if defined?(ActiveSupport::BroadcastLogger)
+          Rails.logger = @logger
+        else
+          Rails.logger.reopen('/dev/null') rescue Rails.logger.reopen('NUL') # supports Windows NUL device
+          Rails.logger.level = @logger.level
+          Rails.logger.extend(ActiveSupport::Logger.broadcast(@logger))
+        end
       end
     rescue Exception => ex
       @logger.error "Exception with logger: #{ex.to_s}"

data/lib/skiplock/version.rb

@@ -1,4 +1,4 @@
 module Skiplock
-  VERSION = Version = '1.1.3'
+  VERSION = Version = '1.1.5'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skiplock
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Tin Vo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2023-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: ActiveJob Queue Adapter for PostgreSQL