diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-13 10:27:25 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-13 10:27:25 -0700 |
| commit | b205ae8a949d47737f9ae6046b164ef64bd88015 (patch) | |
| tree | 3251ebdadce7c7d43c545dba0f53ac124b4b4207 /railties/lib | |
| parent | aa9101eb7e9b219a1d628f9ba60f891083350ab2 (diff) | |
| parent | 16c0023a9a14688bbc96d81e809bd26ccf651438 (diff) | |
| download | rails-b205ae8a949d47737f9ae6046b164ef64bd88015.tar.gz rails-b205ae8a949d47737f9ae6046b164ef64bd88015.tar.bz2 rails-b205ae8a949d47737f9ae6046b164ef64bd88015.zip | |
Merge pull request #12514 from schuetzm/stdout-logging-with-implicit-development-env
Make logging to stdout work again with implicit `development` env
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 485bd1eb09..4201dac42f 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -1,6 +1,7 @@ require 'fileutils' require 'optparse' require 'action_dispatch' +require 'rails' module Rails class Server < ::Rack::Server @@ -32,7 +33,7 @@ module Rails opt_parser.parse! args - options[:log_stdout] = options[:daemonize].blank? && options[:environment] == "development" + options[:log_stdout] = options[:daemonize].blank? && (options[:environment] || Rails.env) == "development" options[:server] = args.shift options end |