diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-15 10:46:30 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-15 12:24:31 +0100 |
| commit | b0994be5bd24559f1362a636b46271de6d6a92d6 (patch) | |
| tree | e74234e7f473f8277e4393bd347f2ceab9dbe069 /railties/lib/rails/commands | |
| parent | b4019d5080181a911f8652cabd184794963911b6 (diff) | |
| download | rails-b0994be5bd24559f1362a636b46271de6d6a92d6.tar.gz rails-b0994be5bd24559f1362a636b46271de6d6a92d6.tar.bz2 rails-b0994be5bd24559f1362a636b46271de6d6a92d6.zip | |
LogTailer should be invoked after all logs in threads were flushed.
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index b21ae2a17b..851a21c51d 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -46,6 +46,7 @@ module Rails trap(:INT) { exit } puts "=> Ctrl-C to shutdown server" unless options[:daemonize] + Rails::Subscriber.tail_log = true unless options[:daemonize] super ensure puts 'Exiting' unless options[:daemonize] @@ -53,15 +54,10 @@ module Rails def middleware middlewares = [] - middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize] middlewares << [Rails::Rack::Debugger] if options[:debugger] Hash.new(middlewares) end - def log_path - "log/#{options[:environment]}.log" - end - def default_options super.merge({ :Port => 3000, |