diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-24 17:21:17 +0000 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-03-24 17:21:17 +0000 |
| commit | 9887f238871bb2dd73de6ce8855615bcc5d8d079 (patch) | |
| tree | 74fa9ff9524a51701cfa23f708b3f777c65b7fe5 /railties/lib/rails/rack | |
| parent | aff821508a16245ebc03510ba29c70379718dfb7 (diff) | |
| parent | 5214e73850916de3c9127d35a4ecee0424d364a3 (diff) | |
| download | rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.tar.gz rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.tar.bz2 rails-9887f238871bb2dd73de6ce8855615bcc5d8d079.zip | |
Merge branch 'master' of https://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails/rack')
| -rw-r--r-- | railties/lib/rails/rack/log_tailer.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/rack/logger.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/rack/log_tailer.rb b/railties/lib/rails/rack/log_tailer.rb index 011ac6cecc..830d840894 100644 --- a/railties/lib/rails/rack/log_tailer.rb +++ b/railties/lib/rails/rack/log_tailer.rb @@ -19,7 +19,7 @@ module Rails def tail! @file.seek @cursor - if !@file.eof? + unless @file.eof? contents = @file.read @cursor = @file.tell $stdout.print contents diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb index b3dc1f894c..3be262de08 100644 --- a/railties/lib/rails/rack/logger.rb +++ b/railties/lib/rails/rack/logger.rb @@ -19,9 +19,9 @@ module Rails def before_dispatch(env) request = ActionDispatch::Request.new(env) - path = request.fullpath + path = request.filtered_path - info "\n\nStarted #{env["REQUEST_METHOD"]} \"#{path}\" " \ + info "\n\nStarted #{request.request_method} \"#{path}\" " \ "for #{request.ip} at #{Time.now.to_default_s}" end |