diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-03-03 16:23:00 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-03-03 21:24:00 -0800 |
| commit | 52efbdcdefa678ae2ee9530bcfefd0e2529b188f (patch) | |
| tree | 3e71fb2dab4c79e3150d2b078ead0ca3f5b7883e | |
| parent | 93422af5d5bc0285bd72cfb2fd9b59f6d64ba141 (diff) | |
| download | rails-52efbdcdefa678ae2ee9530bcfefd0e2529b188f.tar.gz rails-52efbdcdefa678ae2ee9530bcfefd0e2529b188f.tar.bz2 rails-52efbdcdefa678ae2ee9530bcfefd0e2529b188f.zip | |
Add caller to request_uri deprecation notice
| -rw-r--r-- | actionpack/lib/action_dispatch/http/url.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/rack/logger.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index f7afbe7fed..b64a83c62e 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -88,7 +88,7 @@ module ActionDispatch # Returns the request URI, accounting for server idiosyncrasies. # WEBrick includes the full URL. IIS leaves REQUEST_URI blank. def request_uri - ActiveSupport::Deprecation.warn "Using #request_uri is deprecated. Use fullpath instead." + ActiveSupport::Deprecation.warn "Using #request_uri is deprecated. Use fullpath instead.", caller fullpath end diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb index 2efe224e94..dd8b342f59 100644 --- a/railties/lib/rails/rack/logger.rb +++ b/railties/lib/rails/rack/logger.rb @@ -19,7 +19,7 @@ module Rails def before_dispatch(env) request = ActionDispatch::Request.new(env) - path = request.request_uri.inspect rescue "unknown" + path = request.fullpath.inspect rescue "unknown" info "\n\nStarted #{request.method.to_s.upcase} #{path} " << "for #{request.remote_ip} at #{Time.now.to_s(:db)}" |