aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-06-27 16:27:08 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-06-27 16:27:08 +0200
commit78f3c88d69741ffd9b24da8d362f3f7c4c8454f8 (patch)
tree36f5ef51171d780db08fe1d855b5179236b87e36 /lib
parent3dd19d9d3c4bf678d45230485403e7460e75373f (diff)
downloadrails-78f3c88d69741ffd9b24da8d362f3f7c4c8454f8.tar.gz
rails-78f3c88d69741ffd9b24da8d362f3f7c4c8454f8.tar.bz2
rails-78f3c88d69741ffd9b24da8d362f3f7c4c8454f8.zip
Better ordering
Diffstat (limited to 'lib')
-rw-r--r--lib/action_cable/connection/base.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb
index ba1a486afb..ae9dd58ab4 100644
--- a/lib/action_cable/connection/base.rb
+++ b/lib/action_cable/connection/base.rb
@@ -78,7 +78,6 @@ module ActionCable
attr_reader :websocket
attr_reader :heartbeat, :subscriptions, :message_buffer
-
def websocket_initialization
@websocket = Faye::WebSocket.new(@env)
end
@@ -125,6 +124,12 @@ module ActionCable
end
+ # Tags are declared in the server but computed in the connection. This allows us per-connection tailored tags.
+ def initialize_tagged_logger
+ TaggedLoggerProxy.new server.logger,
+ tags: server.log_tags.map { |tag| tag.respond_to?(:call) ? tag.call(request) : tag.to_s.camelize }
+ end
+
def started_request_message
'Started %s "%s"%s for %s at %s' % [
request.request_method,
@@ -141,13 +146,6 @@ module ActionCable
request.ip,
Time.now.to_default_s ]
end
-
-
- # Tags are declared in the server but computed in the connection. This allows us per-connection tailored tags.
- def initialize_tagged_logger
- TaggedLoggerProxy.new server.logger,
- tags: server.log_tags.map { |tag| tag.respond_to?(:call) ? tag.call(request) : tag.to_s.camelize }
- end
end
end
end