diff options
| -rw-r--r-- | doc/site/src/docs/lighttpd.page | 2 | ||||
| -rw-r--r-- | doc/site/src/docs/mongrel_cluster.page | 8 | ||||
| -rw-r--r-- | doc/site/src/docs/pound.page | 2 | ||||
| -rw-r--r-- | lib/mongrel/handlers.rb | 38 |
4 files changed, 25 insertions, 25 deletions
diff --git a/doc/site/src/docs/lighttpd.page b/doc/site/src/docs/lighttpd.page index ffd12d2..68214c5 100644 --- a/doc/site/src/docs/lighttpd.page +++ b/doc/site/src/docs/lighttpd.page @@ -1,4 +1,4 @@ --- +--- title: Lighttpd inMenu: true directoryName: Documentation diff --git a/doc/site/src/docs/mongrel_cluster.page b/doc/site/src/docs/mongrel_cluster.page index 425ddc0..1019607 100644 --- a/doc/site/src/docs/mongrel_cluster.page +++ b/doc/site/src/docs/mongrel_cluster.page @@ -31,7 +31,7 @@ Throughout these instructions we will assume the following: h2. Preliminary steps In general, when deploying a mongrel cluster, none of the mongrel servers will -be listening on a privleged port. This is nice, we don't have to run mongrel as +be listening on a privileged port. This is nice, we don't have to run mongrel as root, therefore we should create a user for mongrel to run as: <pre><code> $ sudo /usr/sbin/adduser -r mongrel @@ -55,7 +55,7 @@ the log directory of your app has to be writable by the *mongrel* user: h2. Mongrel Cluster Setup -With mongrel working and our webapp directory prepared we can procede with the +With mongrel working and our webapp directory prepared we can proceed with the mongrel_cluster configuration step: <pre><code> $ sudo mongrel_rails cluster::configure -e production -p 8000 -N 3 \ @@ -72,7 +72,7 @@ Checking our host on ports 8000, 8001, and 8002 we should now be able to see our test application. We can stop all of those mongrels with @sudo mongrel_rails cluster::stop@. -h2. On Boot Inititialization Setup +h2. On Boot Initialization Setup At this point, mongrel and mongrel_cluster are setup and working with our sample webapp. Ultimately, we want this cluster to start on boot. Fortunately, @@ -111,7 +111,7 @@ for several of the other deployment guides. <hr> fn1. Thanks to "Bradley Taylor":http://fluxura.com/ for writing -mongrel_cluster and recent improvements in its startup capabilites. +mongrel_cluster and recent improvements in its startup capabilities. fn2. @adduser -r@ is a RedHat-centric way of creating a system account. For Debian-ish distributions replace that with @adduser --system mongrel@. diff --git a/doc/site/src/docs/pound.page b/doc/site/src/docs/pound.page index f842f74..8a91e60 100644 --- a/doc/site/src/docs/pound.page +++ b/doc/site/src/docs/pound.page @@ -132,7 +132,7 @@ end </code> </pre> -And the acompanying view, app/views/test/index.rhtml: +And the accompanying view, app/views/test/index.rhtml: <pre> <h1>test</h1> diff --git a/lib/mongrel/handlers.rb b/lib/mongrel/handlers.rb index 99aaeae..1d0cd37 100644 --- a/lib/mongrel/handlers.rb +++ b/lib/mongrel/handlers.rb @@ -275,7 +275,7 @@ module Mongrel # look at the client's allowed response types and then gzip # compress anything that is going out. # - # Valid option is :always_deflate => false which tells the handler to + # Valid option is :always_deflate => false which tells the handler to # deflate everything even if the client can't handle it. class DeflateFilter < HttpHandler HTTP_ACCEPT_ENCODING = "HTTP_ACCEPT_ENCODING" @@ -363,28 +363,28 @@ module Mongrel def describe_listener results = "" - results << "<h1>Listener #{listener.host}:#{listener.port}</h1>" - results << table("settings", [ - ["host",listener.host], - ["port",listener.port], - ["timeout",listener.timeout], - ["workers max",listener.num_processors], - ]) - - if @stats - results << "<h2>Statistics</h2><p>N means the number of samples, pay attention to MEAN, SD, MIN and MAX." - results << "<pre>#{@stats.dump}</pre>" - end + results << "<h1>Listener #{listener.host}:#{listener.port}</h1>" + results << table("settings", [ + ["host",listener.host], + ["port",listener.port], + ["timeout",listener.timeout], + ["workers max",listener.num_processors], + ]) + + if @stats + results << "<h2>Statistics</h2><p>N means the number of samples, pay attention to MEAN, SD, MIN and MAX." + results << "<pre>#{@stats.dump}</pre>" + end - results << "<h2>Registered Handlers</h2>" - uris = listener.classifier.handler_map - results << table("handlers", uris.map {|uri,handlers| - [uri, + results << "<h2>Registered Handlers</h2>" + uris = listener.classifier.handler_map + results << table("handlers", uris.map {|uri,handlers| + [uri, "<pre>" + handlers.map {|h| h.class.to_s }.join("\n") + "</pre>" - ] - }) + ] + }) results end |