diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-09-22 20:02:32 -0700 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-09-22 20:02:32 -0700 |
| commit | c21941b1c71b9254103929117670e7cbb53aa243 (patch) | |
| tree | 5d7d9e8319db97feb754ef1859bc3ca1ea998c1a /railties/lib/rails | |
| parent | 7dcde9fba4928eb68a5f6be7173af29ba775401c (diff) | |
| parent | 5f98bb402b657f785e6bf1a49e83d44c6d3aa062 (diff) | |
| download | rails-c21941b1c71b9254103929117670e7cbb53aa243.tar.gz rails-c21941b1c71b9254103929117670e7cbb53aa243.tar.bz2 rails-c21941b1c71b9254103929117670e7cbb53aa243.zip | |
Merge pull request #11060 from schneems/schneems/multi-stdout-logging-master
Only output Server logs in Development
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 87d6505ed5..485bd1eb09 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -32,7 +32,8 @@ module Rails opt_parser.parse! args - options[:server] = args.shift + options[:log_stdout] = options[:daemonize].blank? && options[:environment] == "development" + options[:server] = args.shift options end end @@ -74,7 +75,7 @@ module Rails FileUtils.mkdir_p(File.join(Rails.root, 'tmp', dir_to_make)) end - unless options[:daemonize] + if options[:log_stdout] wrapped_app # touch the app so the logger is set up console = ActiveSupport::Logger.new($stdout) |