From b0994be5bd24559f1362a636b46271de6d6a92d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 15 Jan 2010 10:46:30 +0100 Subject: LogTailer should be invoked after all logs in threads were flushed. --- railties/lib/rails/commands/server.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'railties/lib/rails/commands') 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, -- cgit v1.2.3