diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-10-03 05:38:25 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-10-03 05:38:25 +1030 |
| commit | a92fa726003880f5d28367459ddaf134c44b1697 (patch) | |
| tree | f497be8940a8043b7e9a7c081a897ccfa550d8a2 /actioncable | |
| parent | 4f8e336c44378e819ce36cb291bc6e9dce0cc7e0 (diff) | |
| download | rails-a92fa726003880f5d28367459ddaf134c44b1697.tar.gz rails-a92fa726003880f5d28367459ddaf134c44b1697.tar.bz2 rails-a92fa726003880f5d28367459ddaf134c44b1697.zip | |
Shut down the worker pool - don't kill it
Different parts of concurrent-ruby's documentation make inconsistent
claims about how kill will behave. It doesn't do the thing we want.
Diffstat (limited to 'actioncable')
| -rw-r--r-- | actioncable/lib/action_cable/server/worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/server/worker.rb b/actioncable/lib/action_cable/server/worker.rb index 7460472551..43639c27af 100644 --- a/actioncable/lib/action_cable/server/worker.rb +++ b/actioncable/lib/action_cable/server/worker.rb @@ -25,7 +25,7 @@ module ActionCable # Stop processing work: any work that has not already started # running will be discarded from the queue def halt - @executor.kill + @executor.shutdown end def stopping? |