aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
diff options
context:
space:
mode:
authorMike Perham <mperham@gmail.com>2016-01-05 16:26:53 -0800
committerMike Perham <mperham@gmail.com>2016-01-05 16:26:53 -0800
commitcd1d7e287b09a6461d8eb5febd877602de6aca6c (patch)
treeed4a6ad3f00f2309aabc7abcf308cb1ceb690c98 /actioncable
parente529e3428e2fdcbc03ab9010127c743cc276dbf2 (diff)
downloadrails-cd1d7e287b09a6461d8eb5febd877602de6aca6c.tar.gz
rails-cd1d7e287b09a6461d8eb5febd877602de6aca6c.tar.bz2
rails-cd1d7e287b09a6461d8eb5febd877602de6aca6c.zip
don't need explicit dep and a pretty neat pick
Diffstat (limited to 'actioncable')
-rw-r--r--actioncable/actioncable.gemspec1
-rw-r--r--actioncable/lib/action_cable/server/worker.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/actioncable/actioncable.gemspec b/actioncable/actioncable.gemspec
index b6e529e879..a04fc932aa 100644
--- a/actioncable/actioncable.gemspec
+++ b/actioncable/actioncable.gemspec
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
s.add_dependency 'coffee-rails', '~> 4.1.0'
s.add_dependency 'faye-websocket', '~> 0.10.0'
s.add_dependency 'websocket-driver', '~> 0.6.1'
- s.add_dependency 'concurrent-ruby', '~> 1.0.0'
s.add_dependency 'em-hiredis', '~> 0.3.0'
s.add_dependency 'redis', '~> 3.0'
diff --git a/actioncable/lib/action_cable/server/worker.rb b/actioncable/lib/action_cable/server/worker.rb
index 7787e99baf..3b6c6d44a1 100644
--- a/actioncable/lib/action_cable/server/worker.rb
+++ b/actioncable/lib/action_cable/server/worker.rb
@@ -12,7 +12,7 @@ module ActionCable
define_callbacks :work
include ActiveRecordConnectionManagement
- def initialize(max_size=5)
+ def initialize(max_size: 5)
@pool = Concurrent::ThreadPoolExecutor.new(
min_threads: 1,
max_threads: max_size,