1 files changed, 14 insertions, 6 deletions
diff --git a/lib/action_cable/server.rb b/lib/action_cable/server.rb
index 2278509341..a2a89d5f1e 100644
--- a/lib/action_cable/server.rb
+++ b/lib/action_cable/server.rb
@@ -1,11 +1,19 @@
+require 'eventmachine'
+EventMachine.epoll  if EventMachine.epoll?
+EventMachine.kqueue if EventMachine.kqueue?
+
 module ActionCable
   module Server
-    autoload :Base, 'action_cable/server/base'
-    autoload :Broadcasting, 'action_cable/server/broadcasting'
-    autoload :Connections, 'action_cable/server/connections'
-    autoload :Configuration, 'action_cable/server/configuration'
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Base
+      autoload :Broadcasting
+      autoload :Connections
+      autoload :Configuration
 
-    autoload :Worker, 'action_cable/server/worker'
-    autoload :ActiveRecordConnectionManagement, 'action_cable/server/worker/active_record_connection_management'
+      autoload :Worker
+      autoload :ActiveRecordConnectionManagement, 'action_cable/server/worker/active_record_connection_management'
+    end
   end
 end