1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00

merge master

This commit is contained in:
Mike Perham 2014-03-06 21:56:59 -08:00
commit 6f5d1d691b
3 changed files with 7 additions and 3 deletions

View file

@ -27,6 +27,7 @@ Please see [Upgrading.md](Upgrading.md) for more comprehensive upgrade notes.
- Remove deprecated support for the old Sidekiq::Worker#retries\_exhausted method. - Remove deprecated support for the old Sidekiq::Worker#retries\_exhausted method.
- Remove usage of the term 'Worker' in the UI for clarity. Users would call both threads and - Remove usage of the term 'Worker' in the UI for clarity. Users would call both threads and
processes 'workers'. Instead, use "Thread", "Process" or "Job". processes 'workers'. Instead, use "Thread", "Process" or "Job".
- Add new 💣 alias for #clear in API.
2.17.7 2.17.7
----------- -----------

View file

@ -1,3 +1,4 @@
# encoding: utf-8
require 'sidekiq' require 'sidekiq'
module Sidekiq module Sidekiq
@ -155,6 +156,7 @@ module Sidekiq
end end
end end
end end
alias_method :💣, :clear
end end
## ##
@ -282,6 +284,7 @@ module Sidekiq
conn.del(name) conn.del(name)
end end
end end
alias_method :💣, :clear
end end
class JobSet < SortedSet class JobSet < SortedSet

View file

@ -140,10 +140,10 @@ module Sidekiq
end end
end end
# Creating the Redis#blpop command takes into account any # Creating the Redis#brpop command takes into account any
# configured queue weights. By default Redis#blpop returns # configured queue weights. By default Redis#brpop returns
# data from the first queue that has pending elements. We # data from the first queue that has pending elements. We
# recreate the queue command each time we invoke Redis#blpop # recreate the queue command each time we invoke Redis#brpop
# to honor weights and avoid queue starvation. # to honor weights and avoid queue starvation.
def queues_cmd def queues_cmd
queues = @strictly_ordered_queues ? @unique_queues.dup : @queues.shuffle.uniq queues = @strictly_ordered_queues ? @unique_queues.dup : @queues.shuffle.uniq