diff options
author | José Valim <jose.valim@gmail.com> | 2011-05-07 02:21:49 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-05-07 02:22:17 +0200 |
commit | c515f64f72d070b9481ab8b62c98aaae45b96323 (patch) | |
tree | d1d3ab936adab600aa8c917a61a73b125d1f15e5 /actionpack/lib/action_controller | |
parent | fa8623b52ef136d9479fe4f9cc61256228d590e0 (diff) | |
download | rails-c515f64f72d070b9481ab8b62c98aaae45b96323.tar.gz rails-c515f64f72d070b9481ab8b62c98aaae45b96323.tar.bz2 rails-c515f64f72d070b9481ab8b62c98aaae45b96323.zip |
Use .ref instead of .to_sym.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/log_subscriber.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_controller/metal/instrumentation.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb index 3fae697cc3..8d813a8e38 100644 --- a/actionpack/lib/action_controller/log_subscriber.rb +++ b/actionpack/lib/action_controller/log_subscriber.rb @@ -7,8 +7,10 @@ module ActionController def start_processing(event) payload = event.payload params = payload[:params].except(*INTERNAL_PARAMS) + format = payload[:format] + format = format.to_s.upcase if format.is_a?(Symbol) - info " Processing by #{payload[:controller]}##{payload[:action]} as #{payload[:formats].first.to_s.upcase}" + info " Processing by #{payload[:controller]}##{payload[:action]} as #{format}" info " Parameters: #{params.inspect}" unless params.empty? end diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb index 4e54c2ad88..16cbbce2fb 100644 --- a/actionpack/lib/action_controller/metal/instrumentation.rb +++ b/actionpack/lib/action_controller/metal/instrumentation.rb @@ -19,7 +19,7 @@ module ActionController :controller => self.class.name, :action => self.action_name, :params => request.filtered_parameters, - :formats => request.formats.map(&:to_sym), + :format => request.format.ref, :method => request.method, :path => (request.fullpath rescue "unknown") } |