Merge branch 'master' of github.com:lifo/docrails

1 files changed, 46 insertions, 33 deletions

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 87d6505ed5..fec4962fb5 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
@@ -21,7 +22,7 @@ module Rails
           opts.on("-e", "--environment=name", String,
                   "Specifies the environment to run this server under (test/development/production).",
                   "Default: development") { |v| options[:environment] = v }
-          opts.on("-P","--pid=pid",String,
+          opts.on("-P", "--pid=pid", String,
                   "Specifies the PID file.",
                   "Default: tmp/pids/server.pid") { |v| options[:pid] = v }
 
@@ -32,7 +33,8 @@ module Rails
 
         opt_parser.parse! args
 
-        options[:server] = args.shift
+        options[:log_stdout] = options[:daemonize].blank? && (options[:environment] || Rails.env) == "development"
+        options[:server]     = args.shift
         options
       end
     end
@@ -59,30 +61,10 @@ module Rails
     end
 
     def start
-      url = "#{options[:SSLEnable] ? 'https' : 'http'}://#{options[:Host]}:#{options[:Port]}"
-      puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
-      puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
-      puts "=> Run `rails server -h` for more startup options"
-      if options[:Host].to_s.match(/0\.0\.0\.0/)
-        puts "=> Notice: server is listening on all interfaces (#{options[:Host]}). Consider using 127.0.0.1 (--binding option)"
-      end
+      print_boot_information
       trap(:INT) { exit }
-      puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
-
-      #Create required tmp directories if not found
-      %w(cache pids sessions sockets).each do |dir_to_make|
-        FileUtils.mkdir_p(File.join(Rails.root, 'tmp', dir_to_make))
-      end
-
-      unless options[:daemonize]
-        wrapped_app # touch the app so the logger is set up
-
-        console = ActiveSupport::Logger.new($stdout)
-        console.formatter = Rails.logger.formatter
-        console.level = Rails.logger.level
-
-        Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
-      end
+      create_tmp_directories
+      log_to_stdout if options[:log_stdout]
 
       super
     ensure
@@ -93,7 +75,7 @@ module Rails
 
     def middleware
       middlewares = []
-      middlewares << [Rails::Rack::Debugger]  if options[:debugger]
+      middlewares << [Rails::Rack::Debugger] if options[:debugger]
       middlewares << [::Rack::ContentLength]
 
       # FIXME: add Rack::Lock in the case people are using webrick.
@@ -113,14 +95,45 @@ module Rails
 
     def default_options
       super.merge({
-        Port:         3000,
-        DoNotReverseLookup:  true,
-        environment:  (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
-        daemonize:    false,
-        debugger:     false,
-        pid:          File.expand_path("tmp/pids/server.pid"),
-        config:       File.expand_path("config.ru")
+        Port:               3000,
+        DoNotReverseLookup: true,
+        environment:        (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
+        daemonize:          false,
+        debugger:           false,
+        pid:                File.expand_path("tmp/pids/server.pid"),
+        config:             File.expand_path("config.ru")
       })
     end
+
+    private
+
+      def print_boot_information
+        url = "#{options[:SSLEnable] ? 'https' : 'http'}://#{options[:Host]}:#{options[:Port]}"
+        puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
+        puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
+        puts "=> Run `rails server -h` for more startup options"
+
+        if options[:Host].to_s.match(/0\.0\.0\.0/)
+          puts "=> Notice: server is listening on all interfaces (#{options[:Host]}). Consider using 127.0.0.1 (--binding option)"
+        end
+
+        puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
+      end
+
+      def create_tmp_directories
+        %w(cache pids sessions sockets).each do |dir_to_make|
+          FileUtils.mkdir_p(File.join(Rails.root, 'tmp', dir_to_make))
+        end
+      end
+
+      def log_to_stdout
+        wrapped_app # touch the app so the logger is set up
+
+        console = ActiveSupport::Logger.new($stdout)
+        console.formatter = Rails.logger.formatter
+        console.level = Rails.logger.level
+
+        Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
+      end
   end
 end