backburner-allq 1.0.9 → 1.0.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 252fc4e5aa793b391b70aa0d4947d88c7d3c1ad3df7807824a9b7c351937caff
4
- data.tar.gz: b1f459dc189399a59d26bebae015b10377916fd250edf66a987cbb8bcb264ca6
3
+ metadata.gz: be49d546e185343febc87691b110911a78dfe0f6fc268a20085442b0f21bbb73
4
+ data.tar.gz: ac1bc4e183f81ba0240bfc13ce20529213258acc3341c174cea53bc5707cdb0a
5
5
  SHA512:
6
- metadata.gz: 8ce217f35c0b62b80e707264c253a479e828f0d5a075b145c63d558c4f525d1928d6fbb0f4e247adcff71fe398bec213ecbf75d67ae83c3794413f49b2832cec
7
- data.tar.gz: 4229e711046a0f055fda7992708be107e1e53d6dc9eca834bfade289734188d46b7e86c13d567eec14bce6fcd263943f9c7e6202e4ab2c254759ee34ec8b80da
6
+ metadata.gz: 4e515438a03f290084867129c0f749b4a6a0f6eb1a39749a24093b827b519077cacc0f2d17d4d446cef59b0ae533bd69d34f863d9f873b499e2c6608563ade92
7
+ data.tar.gz: a91dc0abcd0a2a0b03ab94ab0ab60275c5239626b40424f44b27b5f4bb8d6cd8404361196fcb8851a650d18848b12d091ca4b9d03f049ffa26eb5853e72c6539
data/deploy.sh CHANGED
@@ -1,3 +1,3 @@
1
1
  echo "Did you update the version?"
2
2
  gem build backburner-allq.gemspec
3
- gem push backburner-allq-1.0.9.gem
3
+ gem push backburner-allq-1.0.11.gem
@@ -25,8 +25,8 @@ module Backburner
25
25
  # @example
26
26
  # Backburner.enqueue NewsletterSender, self.id, user.id
27
27
  #
28
- def enqueue(job_class, *args)
29
- Backburner::Worker.enqueue(job_class, args, {})
28
+ def enqueue(job_class, args, opts = {})
29
+ Backburner::Worker.enqueue(job_class, args, opts)
30
30
  end
31
31
 
32
32
  # Begins working on jobs enqueued with optional tubes specified
@@ -114,7 +114,9 @@ module Backburner
114
114
  @client.release_put(job.id)
115
115
  end
116
116
 
117
- def bury(job); end
117
+ def bury(job)
118
+ @client.bury_put(job.id)
119
+ end
118
120
 
119
121
  def tube_names
120
122
  stats_hash = stats
@@ -161,15 +163,8 @@ module Backburner
161
163
 
162
164
  default = 5
163
165
 
164
- return default if app_priority == 32_000
165
-
166
- return 6 if app_priority >= 33_000
167
-
168
- return 7 if app_priority >= 35_000
169
-
170
- return 8 if app_priority >= 37_000
171
-
172
- default
166
+ # return app_priority unless larger than 10
167
+ app_priority > 10 ? 5 : app_priority
173
168
  end
174
169
 
175
170
  def log_result(job_result)
@@ -191,6 +186,7 @@ module Backburner
191
186
  ttl: ttl,
192
187
  delay: delay,
193
188
  priority: adjusted_priority,
189
+ shard_key: options[:shard_key],
194
190
  parent_id: parent_id)
195
191
  new_job
196
192
  end
@@ -212,21 +208,11 @@ module Backburner
212
208
  priority: adjusted_priority,
213
209
  timeout: timeout,
214
210
  run_on_timeout: run_on_timeout,
211
+ shard_key: options[:shard_key]
215
212
  limit: limit)
216
213
  new_parent_job
217
214
  end
218
215
 
219
- def put2(body, pri = 5, ttl = 600, tube_name = "default", delay = 0)
220
- # Old school way
221
- options = {
222
- pri: pri,
223
- ttl: ttl,
224
- tube_name: tube_name,
225
- delay: delay
226
- }
227
- put(body, options)
228
- end
229
-
230
216
  def put(body, options)
231
217
  # New school put
232
218
  retry_count = 0
@@ -236,7 +222,6 @@ module Backburner
236
222
  begin
237
223
  Timeout.timeout(10) do
238
224
  if body && body.to_s.include?('["default"]')
239
- puts "PUTTING DEFAULT! #{caller.inspect}"
240
225
  end
241
226
 
242
227
  if is_parent
@@ -96,9 +96,17 @@ module Backburner
96
96
 
97
97
  def put(tube_name, data, opt)
98
98
  pri = (opt[:pri] || 5).to_i
99
- delay = opt[:delay].to_i
100
99
  ttr = (opt[:ttr] || 600).to_i
101
- @allq_wrapper.put2(data, pri, ttr, tube_name, delay)
100
+
101
+ options = {
102
+ tube_name: tube_name,
103
+ pri: pri,
104
+ delay: opt[:delay].to_i,
105
+ ttr: ttr
106
+ }
107
+
108
+ options.merge!(opt)
109
+ @allq_wrapper.put(data, options)
102
110
  end
103
111
 
104
112
  def get(tube_name)
@@ -1,3 +1,3 @@
1
1
  module Backburner
2
- VERSION = "1.0.9"
2
+ VERSION = "1.0.11"
3
3
  end
@@ -40,8 +40,7 @@ module Backburner
40
40
  connection.retryable do
41
41
  tube_name = expand_tube_name(queue || job_class)
42
42
  serialized_data = Backburner.configuration.job_serializer_proc.call(data)
43
- puts "Tube name #{tube_name}"
44
- response = connection.put(tube_name, serialized_data, :pri => pri, :delay => delay, :ttr => ttr)
43
+ response = connection.put(tube_name, serialized_data, :pri => pri, :delay => delay, :ttr => ttr, :shard_key => opts[:shard_key])
45
44
  end
46
45
  return nil unless Backburner::Hooks.invoke_hook_events(job_class, :after_enqueue, *args)
47
46
  ensure
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: backburner-allq
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.9
4
+ version: 1.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jason Malcolm
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-09-09 00:00:00.000000000 Z
11
+ date: 2021-01-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: allq_rest