diff options
author | zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9> | 2006-04-01 08:43:30 +0000 |
---|---|---|
committer | zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9> | 2006-04-01 08:43:30 +0000 |
commit | e20a52b735e83db3dbd20f1d96e947cc8bf82161 (patch) | |
tree | 3170a1182a60e4f82ee1af7efd157cbdc72f2696 /bin/mongrel_rails | |
parent | 6d1c93465b1c46acb9ede4bd0dbf3ab360981e6a (diff) | |
download | unicorn-e20a52b735e83db3dbd20f1d96e947cc8bf82161.tar.gz |
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@135 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'bin/mongrel_rails')
-rw-r--r-- | bin/mongrel_rails | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/mongrel_rails b/bin/mongrel_rails index 20784bb..679c1e2 100644 --- a/bin/mongrel_rails +++ b/bin/mongrel_rails @@ -22,7 +22,8 @@ class Start < GemPlugin::Plugin "/commands" ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd], ['-r', '--root PATH', "Set the document root (default 'public')", :@docroot, "public"], ['-B', '--debug', "Enable debugging mode", :@debug, false], - ['-C', '--config PATH', "Use a config file", :@config_file, nil] + ['-C', '--config PATH', "Use a config file", :@config_file, nil], + ['-S', '--script PATH', "Load the given file as an extra config script.", :@config_script, nil] ] end @@ -83,6 +84,11 @@ class Start < GemPlugin::Plugin "/commands" log "Loading any Rails specific GemPlugins" load_plugins + if settings[:config_script] + log "Loading #{settings[:config_script]} external config script" + run_config("config/mongrel.rb") + end + setup_rails_signals end end |