Make script/server work with correct application.rb

felipebs · Nov 16, 2009 · c299701 · c299701
1 parent 2675ba9
commit c299701
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
@@ -3,6 +3,11 @@ class Application
     include Initializable
 
     class << self
+      def inherited(klass)
+        Rails.application ||= klass unless klass.name =~ /Rails/
+        super
+      end
+
       # Stub out App initialize
       def initialize!
         new

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
@@ -42,7 +42,7 @@
 end
 
 puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
-puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}}"
+puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}"
 
 if options[:detach]
   Process.daemon