aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands/server.rb
diff options
context:
space:
mode:
authorMarc Schütz <schuetzm@gmx.net>2013-10-12 20:27:13 +0200
committerMarc Schütz <schuetzm@gmx.net>2013-10-13 19:21:18 +0200
commit16c0023a9a14688bbc96d81e809bd26ccf651438 (patch)
treedbe6e0e52ef6be636a4b1d0347daf10d89c98287 /railties/lib/rails/commands/server.rb
parent365110196afcf952bc22729d4467d579b708328f (diff)
downloadrails-16c0023a9a14688bbc96d81e809bd26ccf651438.tar.gz
rails-16c0023a9a14688bbc96d81e809bd26ccf651438.tar.bz2
rails-16c0023a9a14688bbc96d81e809bd26ccf651438.zip
Make logging to stdout work again with implicit `development` env
Diffstat (limited to 'railties/lib/rails/commands/server.rb')
-rw-r--r--railties/lib/rails/commands/server.rb3
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