diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-02-10 20:49:01 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-02-10 20:49:01 +0100 |
| commit | daa4779d22d3458c5ef45a21370ed0eafb1cd664 (patch) | |
| tree | 0273c2851f21a9e63bfc591379cdb3007d526f20 | |
| parent | 074ff5ce147bdbc988b54dbc5fb60f6eae9506a9 (diff) | |
| parent | ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30 (diff) | |
| download | rails-daa4779d22d3458c5ef45a21370ed0eafb1cd664.tar.gz rails-daa4779d22d3458c5ef45a21370ed0eafb1cd664.tar.bz2 rails-daa4779d22d3458c5ef45a21370ed0eafb1cd664.zip | |
Merge pull request #23274 from KeithP/actioncable_logging
adds debug logging to actioncable connect
| -rw-r--r-- | actioncable/lib/action_cable/connection/base.rb | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable/connection/base.rb b/actioncable/lib/action_cable/connection/base.rb index b5f898436a..e23789978c 100644 --- a/actioncable/lib/action_cable/connection/base.rb +++ b/actioncable/lib/action_cable/connection/base.rb @@ -185,12 +185,14 @@ module ActionCable end def respond_to_successful_request + logger.info successful_request_message websocket.rack_response end def respond_to_invalid_request close if websocket.alive? + logger.error invalid_request_message logger.info finished_request_message [ 404, { 'Content-Type' => 'text/plain' }, [ 'Page not found' ] ] end @@ -205,7 +207,7 @@ module ActionCable 'Started %s "%s"%s for %s at %s' % [ request.request_method, request.filtered_path, - websocket.possible? ? ' [WebSocket]' : '', + websocket.possible? ? ' [WebSocket]' : '[non-WebSocket]', request.ip, Time.now.to_s ] end @@ -213,10 +215,22 @@ module ActionCable def finished_request_message 'Finished "%s"%s for %s at %s' % [ request.filtered_path, - websocket.possible? ? ' [WebSocket]' : '', + websocket.possible? ? ' [WebSocket]' : '[non-WebSocket]', request.ip, Time.now.to_s ] end + + def invalid_request_message + 'Failed to upgrade to WebSocket (REQUEST_METHOD: %s, HTTP_CONNECTION: %s, HTTP_UPGRADE: %s)' % [ + env["REQUEST_METHOD"], env["HTTP_CONNECTION"], env["HTTP_UPGRADE"] + ] + end + + def successful_request_message + 'Successfully upgraded to WebSocket (REQUEST_METHOD: %s, HTTP_CONNECTION: %s, HTTP_UPGRADE: %s)' % [ + env["REQUEST_METHOD"], env["HTTP_CONNECTION"], env["HTTP_UPGRADE"] + ] + end end end end |