aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authordmathieu <42@dmathieu.com>2011-05-26 08:09:38 +0200
committerdmathieu <42@dmathieu.com>2011-05-26 11:18:30 +0200
commit16571f9c42e2717eeb8bf7c915911fa1ca714525 (patch)
tree2e5767f931ace577a172b782e687a67837eec6ca /actionpack/lib/action_controller/metal
parentee46bb73d44338b7dfb8976cc59d742b9394148a (diff)
downloadrails-16571f9c42e2717eeb8bf7c915911fa1ca714525.tar.gz
rails-16571f9c42e2717eeb8bf7c915911fa1ca714525.tar.bz2
rails-16571f9c42e2717eeb8bf7c915911fa1ca714525.zip
don't raise an exception if the format isn't recognized
Fixed while traveling to heuruko
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/instrumentation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index 16cbbce2fb..85d0f5f699 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,
- :format => request.format.ref,
+ :format => request.format.try(:ref),
:method => request.method,
:path => (request.fullpath rescue "unknown")
}