2 files changed, 14 insertions, 5 deletions
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 86ab1aabbf..f6bdf129d6 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -46,7 +46,10 @@ module Rails
     def initialize(app, options={})
       @app     = app
       @options = options
+
+      app.sandbox = sandbox?
       app.load_console
+
       @console = app.config.console || IRB
     end
 
@@ -71,7 +74,6 @@ module Rails
     end
 
     def start
-      app.sandbox = sandbox?
       require_debugger if debugger?
       set_environment! if environment?
 
@@ -92,8 +94,8 @@ module Rails
       require 'debugger'
       puts "=> Debugger enabled"
     rescue LoadError
-      puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle, and try again."
-      exit
+      puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle it and try again."
+      exit(1)
     end
   end
 end
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index cdb29a8156..87d6505ed5 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -42,8 +42,12 @@ module Rails
       set_environment
     end
 
+    # TODO: this is no longer required but we keep it for the moment to support older config.ru files.
     def app
-      @app ||= super.respond_to?(:to_app) ? super.to_app : super
+      @app ||= begin
+        app = super
+        app.respond_to?(:to_app) ? app.to_app : app
+      end
     end
 
     def opt_parser
@@ -58,7 +62,10 @@ module Rails
       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 "=> Call with -d to detach" unless options[:daemonize]
+      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
       trap(:INT) { exit }
       puts "=> Ctrl-C to shutdown server" unless options[:daemonize]