skiplock 1.1.7 → 1.1.8

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: 9dc423c28696ac2e1a85e87cbc5bb97d601fbbaa14a10e58f11945863d3bd04f
4
- data.tar.gz: 459d76ff36b464020fb43986713e744500f3f0a2fb0910ee6cec6bd082147630
3
+ metadata.gz: 2ff56b97e28d0f5b162dfb538e33461569af6aa19ba062a85d7efb4ad0d129f2
4
+ data.tar.gz: 32472f59ee0ed8422fadfa52bb4cb59a15518c0211d58f562006748e30a1d72c
5
5
  SHA512:
6
- metadata.gz: a9442d819c8eff5cb5df09a58b698dc6ce72d579971519c8947a9e7341b67617d5d1977783474b0602a12ea63a8271be9ddd0320a16062d36b9adfa077f30905
7
- data.tar.gz: 2d5fa15b5f165c8ded5aa5fa46a2a0710b53f8379c7d4c56685d37353158f365480fce6203323f20693384deaf092d69bc03efad05f35c500ec2c4a53b7a4b09
6
+ metadata.gz: 3b1a4e1314d300ae26e93f77256c6d543d46a425a44ab12d20b07e6c14e5d8d070db8cab532e6fd0fcb0b636fdde7cbee78aff65651e2ee9694b2eab03bfc276
7
+ data.tar.gz: e549e1db28766922325f8ef7b3b59e205df5bc6a6a5b3ca5b40899861c6baf732d973144aa0de2a09bc4d0fa42dc2fe3ec45958696fbbcb93fd60a8bc8b866cc
data/lib/skiplock/cron.rb CHANGED
@@ -3,6 +3,7 @@ module Skiplock
3
3
  class Cron
4
4
  def self.setup
5
5
  cronjobs = []
6
+ Rails.application.eager_load!
6
7
  ActiveJob::Base.descendants.each do |j|
7
8
  next unless j.const_defined?('CRON')
8
9
  cron = j.const_get('CRON')
data/lib/skiplock/job.rb CHANGED
@@ -108,7 +108,6 @@ module Skiplock
108
108
  def execute(purge_completion: true, max_retries: 20)
109
109
  raise 'Job has already been completed' if self.finished_at
110
110
  self.update_columns(running: true, updated_at: Time.now) unless self.running
111
- Skiplock.logger.info("[Skiplock] Performing #{self.job_class} (#{self.id}) from queue '#{self.queue_name || 'default'}'...") if Skiplock.logger
112
111
  self.data ||= {}
113
112
  self.data.delete('result')
114
113
  self.exception_executions ||= {}
@@ -141,7 +140,6 @@ module Skiplock
141
140
  target, method_name = ::YAML.load(self.data['arguments'].first)
142
141
  job_name = "'#{target.name}.#{method_name}'"
143
142
  end
144
- Skiplock.logger.info "[Skiplock] Performed #{job_name} (#{self.id}) from queue '#{self.queue_name || 'default'}' in #{end_time - start_time} seconds"
145
143
  end
146
144
  end
147
145
  self.exception || self.activejob_error || self.data['result']
@@ -4,15 +4,7 @@ module Skiplock
4
4
  @config = Skiplock::DEFAULT_CONFIG.dup
5
5
  @config.merge!(YAML.load_file('config/skiplock.yml')) rescue nil
6
6
  @config.symbolize_keys!
7
- Rails.application.eager_load! if Rails.env.development?
8
- if @config[:extensions] == true
9
- Module.__send__(:include, Skiplock::Extension)
10
- elsif @config[:extensions].is_a?(Array)
11
- @config[:extensions].each { |n| n.constantize.__send__(:extend, Skiplock::Extension) if n.safe_constantize }
12
- end
13
- ActiveJob::Base.__send__(:include, Skiplock::Patch)
14
- Skiplock.namespace = @config[:namespace]
15
- (caller.any?{ |l| l =~ %r{/rack/} } && @config[:workers] == 0) ? async : Cron.setup
7
+ async if (caller.any?{ |l| l =~ %r{/rack/} } && @config[:workers] == 0)
16
8
  end
17
9
 
18
10
  def async
@@ -99,6 +91,13 @@ module Skiplock
99
91
  end
100
92
 
101
93
  def configure
94
+ if @config[:extensions] == true
95
+ Module.__send__(:include, Skiplock::Extension)
96
+ elsif @config[:extensions].is_a?(Array)
97
+ @config[:extensions].each { |n| n.constantize.__send__(:extend, Skiplock::Extension) if n.safe_constantize }
98
+ end
99
+ ActiveJob::Base.__send__(:include, Skiplock::Patch)
100
+ Skiplock.namespace = @config[:namespace]
102
101
  @hostname = "#{`hostname -f`.strip}|#{Socket.ip_address_list.reject(&:ipv4_loopback?).reject(&:ipv6?).map(&:ip_address).join('|')}"
103
102
  @config.transform_values! {|v| v.is_a?(String) ? v.downcase : v}
104
103
  @config[:graceful_shutdown] = 300 if @config[:graceful_shutdown] > 300
@@ -158,7 +157,7 @@ module Skiplock
158
157
  else
159
158
  @logger.extend(ActiveSupport::Logger.broadcast(::Logger.new(File.join(Rails.root, 'log', @config[:log_file].to_s), @config[:log_count] || 5, @config[:log_size] || 10485760)))
160
159
  end
161
- ActiveJob::Base.logger = nil
160
+ ActiveJob::Base.logger = @logger
162
161
  end
163
162
  if @config[:standalone]
164
163
  if defined?(ActiveSupport::BroadcastLogger)
@@ -1,3 +1,3 @@
1
1
  module Skiplock
2
- VERSION = Version = '1.1.7'
2
+ VERSION = Version = '1.1.8'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: skiplock
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.7
4
+ version: 1.1.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tin Vo
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-06-23 00:00:00.000000000 Z
11
+ date: 2024-12-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activejob
@@ -94,7 +94,7 @@ homepage: https://github.com/vtt/skiplock
94
94
  licenses:
95
95
  - MIT
96
96
  metadata: {}
97
- post_install_message:
97
+ post_install_message:
98
98
  rdoc_options: []
99
99
  require_paths:
100
100
  - lib
@@ -109,8 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  requirements: []
112
- rubygems_version: 3.4.10
113
- signing_key:
112
+ rubygems_version: 3.5.16
113
+ signing_key:
114
114
  specification_version: 4
115
115
  summary: ActiveJob Queue Adapter for PostgreSQL
116
116
  test_files: []