Skip to content

Commit

Permalink
Remove concurrent-ruby dependency, fixes #3830
Browse files Browse the repository at this point in the history
  • Loading branch information
mperham committed Apr 26, 2018
1 parent b58c505 commit 822a75d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

[Sidekiq Changes](https://github.com/mperham/sidekiq/blob/master/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/master/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/master/Ent-Changes.md)

HEAD
-----------

- Remove concurrent-ruby gem dependency [#3830]

5.1.3
-----------

Expand Down
5 changes: 3 additions & 2 deletions lib/sidekiq/processor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
require 'sidekiq/job_logger'
require 'sidekiq/job_retry'
require 'thread'
require 'concurrent/map'

module Sidekiq
##
Expand Down Expand Up @@ -206,7 +205,9 @@ def reset

PROCESSED = Counter.new
FAILURE = Counter.new
WORKER_STATE = Concurrent::Map.new
# This is mutable global state but because each thread is storing
# its own unique key/value, there's no thread-safety issue AFAIK.
WORKER_STATE = {}

def stats(job_hash, queue)
tid = Sidekiq::Logging.tid
Expand Down
1 change: 0 additions & 1 deletion sidekiq.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ Gem::Specification.new do |gem|

gem.add_dependency 'redis', '>= 3.3.5', '< 5'
gem.add_dependency 'connection_pool', '~> 2.2', '>= 2.2.0'
gem.add_dependency 'concurrent-ruby', '~> 1.0', '>= 1.0.5'
gem.add_dependency 'rack-protection', '>= 1.5.0'
end

0 comments on commit 822a75d

Please sign in to comment.