From ae9c08f3926ab4669ee7dca1983212182e386c0a Mon Sep 17 00:00:00 2001 From: kp Date: Tue, 26 Jan 2016 20:56:50 +0000 Subject: adds debug logging to actioncable connect --- actioncable/lib/action_cable/connection/base.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/actioncable/lib/action_cable/connection/base.rb b/actioncable/lib/action_cable/connection/base.rb index 0016d1a1a4..23e72daff8 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.debug debugged_request websocket.rack_response end def respond_to_invalid_request close if websocket.alive? + logger.debug debugged_request 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,18 @@ 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 debugged_request + websocket_values = [] + [ "REQUEST_METHOD", + "HTTP_CONNECTION", + "HTTP_UPGRADE" ].each { |key| websocket_values << "#{key} => '#{env[key]}'" } + "This is #{ websocket.possible? ? '' : 'NOT ' }a valid WebSocket request: { #{ websocket_values.join( '; ' ) } }" + end end end end -- cgit v1.2.3 From 8641de93eb98d4ebdb0db2530c8c79c0c4e2f95e Mon Sep 17 00:00:00 2001 From: kp Date: Wed, 10 Feb 2016 17:11:12 +0000 Subject: Logs successful and invalid connections separately --- actioncable/lib/action_cable/connection/base.rb | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/actioncable/lib/action_cable/connection/base.rb b/actioncable/lib/action_cable/connection/base.rb index 23e72daff8..de7ff96d7b 100644 --- a/actioncable/lib/action_cable/connection/base.rb +++ b/actioncable/lib/action_cable/connection/base.rb @@ -185,14 +185,14 @@ module ActionCable end def respond_to_successful_request - logger.debug debugged_request + logger.info successful_request_message websocket.rack_response end def respond_to_invalid_request close if websocket.alive? - logger.debug debugged_request + logger.error invalid_request_message logger.info finished_request_message [ 404, { 'Content-Type' => 'text/plain' }, [ 'Page not found' ] ] end @@ -220,12 +220,16 @@ module ActionCable Time.now.to_s ] end - def debugged_request - websocket_values = [] - [ "REQUEST_METHOD", - "HTTP_CONNECTION", - "HTTP_UPGRADE" ].each { |key| websocket_values << "#{key} => '#{env[key]}'" } - "This is #{ websocket.possible? ? '' : 'NOT ' }a valid WebSocket request: { #{ websocket_values.join( '; ' ) } }" + 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 -- cgit v1.2.3