about summary refs log tree commit homepage
path: root/bin
diff options
context:
space:
mode:
authorevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-09-24 16:26:38 +0000
committerevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-09-24 16:26:38 +0000
commitfd9a2271ffac8073c3f02986b906d782f6b249b7 (patch)
tree0076094d017d69ebbef26c7a40132e5db6e78243 /bin
parente63cf0903bfee6b3fbb61b3597ed49f073f9984d (diff)
downloadunicorn-fd9a2271ffac8073c3f02986b906d782f6b249b7.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@624 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'bin')
-rw-r--r--bin/mongrel_rails5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/mongrel_rails b/bin/mongrel_rails
index bf8379b..9b343b3 100644
--- a/bin/mongrel_rails
+++ b/bin/mongrel_rails
@@ -23,7 +23,8 @@ module Mongrel
         ['-l', '--log FILE', "Where to write log messages", :@log_file, "log/mongrel.log"],
         ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"],
         ['-n', '--num-procs INT', "Number of processors active before clients denied", :@num_procs, 1024],
-        ['-t', '--timeout TIME', "Time to pause (in hundredths of a second) between accepting clients", :@timeout, 0],
+        ['-o', '--timeout TIME', "Time to wait (in seconds) before killing a stalled thread", :@timeout, 0],
+        ['-t', '--throttle TIME', "Time to pause (in hundredths of a second) between accepting clients", :@throttle, 0],
         ['-m', '--mime PATH', "A YAML file that lists additional MIME types", :@mime_map, nil],
         ['-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"],
@@ -174,7 +175,7 @@ module Mongrel
     def config_keys
       @config_keys ||=
         %w(host port cwd log_file pid_file environment docroot mime_map daemon debug includes config_script
-           num_processors timeout user group prefix)
+           num_processors timeout throttle user group prefix)
     end
 
     def settings