aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2015-09-02 15:59:41 -0700
committerJeremy Daer <jeremydaer@gmail.com>2015-09-02 15:59:41 -0700
commit98855fea634aa1c427c18841cf14fa3777201c4b (patch)
tree1e7fecb8b8d54594741852f2a81d5f4136fa0251 /lib
parent4bfe1ab907e438c9d35a13d1a342acb96c7dd1f0 (diff)
downloadrails-98855fea634aa1c427c18841cf14fa3777201c4b.tar.gz
rails-98855fea634aa1c427c18841cf14fa3777201c4b.tar.bz2
rails-98855fea634aa1c427c18841cf14fa3777201c4b.zip
EventMachine: shush epoll warnings by checking for support before enabling. Ditto for kqueue.
Diffstat (limited to 'lib')
-rw-r--r--lib/action_cable.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/action_cable.rb b/lib/action_cable.rb
index b269386c81..d2c5251634 100644
--- a/lib/action_cable.rb
+++ b/lib/action_cable.rb
@@ -1,5 +1,6 @@
require 'eventmachine'
-EM.epoll
+EventMachine.epoll if EventMachine.epoll?
+EventMachine.kqueue if EventMachine.kqueue?
require 'set'