lib/backburner/allq_wrapper.rb in backburner-allq-1.0.9 vs lib/backburner/allq_wrapper.rb in backburner-allq-1.0.11

- old
+ new

@@ -112,11 +112,13 @@ def release(job, _delay = 0) @client.release_put(job.id) end - def bury(job); end + def bury(job) + @client.bury_put(job.id) + end def tube_names stats_hash = stats stats_hash.keys end @@ -159,19 +161,12 @@ # IF already using allq-like priority, stick with it return app_priority if app_priority < 11 && app_priority > 0 default = 5 - return default if app_priority == 32_000 - - return 6 if app_priority >= 33_000 - - return 7 if app_priority >= 35_000 - - return 8 if app_priority >= 37_000 - - default + # return app_priority unless larger than 10 + app_priority > 10 ? 5 : app_priority end def log_result(job_result) puts("ALLQ-HTTP-JOB-ID=#{job_result.job_id}") rescue StandardError => ex @@ -189,10 +184,11 @@ new_job = Allq::NewJob.new(tube: tube_name, body: Base64.strict_encode64(body), ttl: ttl, delay: delay, priority: adjusted_priority, + shard_key: options[:shard_key], parent_id: parent_id) new_job end def build_new_parent_job(body, options) @@ -210,34 +206,23 @@ ttl: ttl, delay: delay, priority: adjusted_priority, timeout: timeout, run_on_timeout: run_on_timeout, + shard_key: options[:shard_key] limit: limit) new_parent_job end - def put2(body, pri = 5, ttl = 600, tube_name = "default", delay = 0) - # Old school way - options = { - pri: pri, - ttl: ttl, - tube_name: tube_name, - delay: delay - } - put(body, options) - end - def put(body, options) # New school put retry_count = 0 is_parent = options[:is_parent] || false result = nil begin Timeout.timeout(10) do if body && body.to_s.include?('["default"]') - puts "PUTTING DEFAULT! #{caller.inspect}" end if is_parent new_job = build_new_parent_job(body, options) result = @client.parent_job_post(new_job)