diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2015-06-22 16:52:41 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2015-06-22 16:52:41 +0200 |
| commit | f91e39429a4f08e4d78196ddcb12dc2930d07d92 (patch) | |
| tree | 9dd5e291f115c613e2637923ec4d0cb50aba3610 /lib | |
| parent | 82f1e19674b290fcee32a048707055e9b82aa310 (diff) | |
| download | rails-f91e39429a4f08e4d78196ddcb12dc2930d07d92.tar.gz rails-f91e39429a4f08e4d78196ddcb12dc2930d07d92.tar.bz2 rails-f91e39429a4f08e4d78196ddcb12dc2930d07d92.zip | |
Clarify what websocket thing we're talking about
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/action_cable/connection/base.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb index 7c79abcb89..0fb98d7293 100644 --- a/lib/action_cable/connection/base.rb +++ b/lib/action_cable/connection/base.rb @@ -24,8 +24,8 @@ module ActionCable def process logger.info started_request_message - if websocket? @websocket = Faye::WebSocket.new(@env) + if websocket_request? websocket.on(:open) { |event| send_async :on_open } websocket.on(:message) { |event| on_message event.data } @@ -115,8 +115,8 @@ module ActionCable websocket && websocket.ready_state == Faye::WebSocket::API::OPEN end - def websocket? - @is_websocket ||= Faye::WebSocket.websocket?(@env) + def websocket_request? + @is_websocket ||= Faye::WebSocket.websocket_request?(@env) end @@ -124,7 +124,7 @@ module ActionCable 'Started %s "%s"%s for %s at %s' % [ request.request_method, request.filtered_path, - websocket? ? ' [Websocket]' : '', + websocket_request? ? ' [Websocket]' : '', request.ip, Time.now.to_default_s ] end @@ -132,7 +132,7 @@ module ActionCable def finished_request_message 'Finished "%s"%s for %s at %s' % [ request.filtered_path, - websocket? ? ' [Websocket]' : '', + websocket_request? ? ' [Websocket]' : '', request.ip, Time.now.to_default_s ] end |