diff options
author | Ian Ownbey <ian@inspir.es> | 2009-01-31 14:18:08 -0800 |
---|---|---|
committer | Ian Ownbey <ian@inspir.es> | 2009-01-31 14:18:08 -0800 |
commit | fa82e8e3fb52e0107163e57a705cc652f276e1ab (patch) | |
tree | 8bf4e995294379699cefec179a77f711d079ad2b /bin | |
parent | dda58fa2d58c4ab2bda0a9580841e3c4e09bb30c (diff) | |
parent | cb3b9862a5fef4f3fd197e0319bbea0de562f9da (diff) | |
download | unicorn-fa82e8e3fb52e0107163e57a705cc652f276e1ab.tar.gz |
* 'master' of git@github.com:fauna/mongrel: Merge pivotal code. Moving toward using a logger instead of dumping to STDERR all over the place. TODO been did. No commands.
Diffstat (limited to 'bin')
-rw-r--r-- | bin/mongrel_rails | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/mongrel_rails b/bin/mongrel_rails index 42ecf31..c9eac8f 100644 --- a/bin/mongrel_rails +++ b/bin/mongrel_rails @@ -31,6 +31,7 @@ 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-processors INT', "Number of processors active before clients denied", :@num_processors, 1024], + ['-N', '--num-threads INT', "Maximum number of requests to process concurrently", :@max_concurrent_threads, 1024], ['-o', '--timeout TIME', "Time to wait (in seconds) before killing a stalled thread", :@timeout, 60], ['-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], @@ -181,7 +182,7 @@ module Mongrel def config_keys @config_keys ||= - %w(address host port cwd log_file pid_file environment docroot mime_map daemon debug includes config_script num_processors timeout throttle user group prefix) + %w(address host port cwd log_file pid_file environment docroot mime_map daemon debug includes config_script num_processors timeout throttle user group prefix max_concurrent_threads) end def settings |