aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/commands/servers/mongrel.rb5
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 34cff52746..88ec145f83 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Ensure the logger is initialized. #5629 [mike@clarkware.com]
+
* Added Mongrel-spawning capabilities to script/process/spawner. Mongrel will be the default choice if installed, otherwise FCGI is tried [DHH]. Examples:
spawner # starts instances on 8000, 8001, and 8002 using Mongrel if available
diff --git a/railties/lib/commands/servers/mongrel.rb b/railties/lib/commands/servers/mongrel.rb
index a110cac7c4..98441aca91 100644
--- a/railties/lib/commands/servers/mongrel.rb
+++ b/railties/lib/commands/servers/mongrel.rb
@@ -1,11 +1,14 @@
require 'rbconfig'
require 'commands/servers/base'
-unless defined?(Mongrel)
+unless defined?(Mongrel)
puts "PROBLEM: Mongrel is not available on your system (or not in your path)"
exit 1
end
+require 'initializer'
+Rails::Initializer.run(:initialize_logger)
+
require 'optparse'
detach = false