From 79be4b98e5c064ed9766de5bb55bf738a9673e12 Mon Sep 17 00:00:00 2001
From: zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>
Date: Tue, 4 Apr 2006 02:07:30 +0000
Subject: Additional debugging dumps just in case the parser is too ruthless. 
 Removed the useless object tracking.

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@141 19e92222-5c0b-0410-8929-a290d50e31e9
---
 bin/mongrel_rails | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'bin')

diff --git a/bin/mongrel_rails b/bin/mongrel_rails
index fc8c447..e622ba2 100644
--- a/bin/mongrel_rails
+++ b/bin/mongrel_rails
@@ -57,18 +57,18 @@ class Start < GemPlugin::Plugin "/commands"
       settings = conf.merge(settings)
     end
     
-    config = Mongrel::Rails::RailsConfigurator.new(settings) do
-      log "Starting Mongrel in #{settings[:environment]} mode at #{settings[:host]}:#{settings[:port]}"
+    config = Mongrel::Rails::RailsConfigurator.new(defaults) do
+      log "Starting Mongrel in #{defaults[:environment]} mode at #{defaults[:host]}:#{defaults[:port]}"
       
       if defaults[:daemon]
-        log "Daemonizing, any open files are closed.  Look at #{settings[:pid_file]} and #{settings[:log_file]} for info."
+        log "Daemonizing, any open files are closed.  Look at #{defaults[:pid_file]} and #{defaults[:log_file]} for info."
         daemonize
       end
       
       listener do
         mime = {}
         if defaults[:mime_map]
-          log "Loading additional MIME types from #{settings[:mime_map]}"
+          log "Loading additional MIME types from #{defaults[:mime_map]}"
           mime = load_mime_map(defaults[:mime_map], mime)
         end
         
@@ -77,16 +77,16 @@ class Start < GemPlugin::Plugin "/commands"
           debug "/"
         end
 
-        log "Starting Rails in environment #{settings[:environment]} ..."
+        log "Starting Rails in environment #{defaults[:environment]} ..."
         uri "/", :handler => rails
         log "Rails loaded."
 
         log "Loading any Rails specific GemPlugins"
         load_plugins
 
-        if settings[:config_script]
-          log "Loading #{settings[:config_script]} external config script"
-          run_config(settings[:config_script])
+        if defaults[:config_script]
+          log "Loading #{defaults[:config_script]} external config script"
+          run_config(defaults[:config_script])
         end
 
         setup_rails_signals
-- 
cgit v1.2.3-24-ge0c7