diff options
| author | zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9> | 2006-06-21 04:23:54 +0000 |
|---|---|---|
| committer | zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9> | 2006-06-21 04:23:54 +0000 |
| commit | 9c659576fa4563576c52aa96eb48db6f6193eed4 (patch) | |
| tree | 41c04134029185dd53c5715ae74f2731b4d7120f /bin | |
| parent | 81cf6c31cc5c2b8e7d4a9e9be640ffcc67681c7f (diff) | |
| download | unicorn-9c659576fa4563576c52aa96eb48db6f6193eed4.tar.gz | |
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@249 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/mongrel_rails | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/mongrel_rails b/bin/mongrel_rails index a3e5571..c446633 100644 --- a/bin/mongrel_rails +++ b/bin/mongrel_rails @@ -70,7 +70,7 @@ class Start < GemPlugin::Plugin "/commands" end if @config_file - STDERR.puts "** Loading settings from #{@config_file} (they override command line)." unless defaults[:daemon] + STDERR.puts "** Loading settings from #{@config_file} (they override command line)." unless settings[:daemon] conf = YAML.load_file(@config_file) settings = settings.merge! conf end |