summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2011-10-11 15:26:12 -0700
committerMarcel Hellkamp <marc@gsites.de>2011-10-11 15:26:12 -0700
commita78fcdec7e8d507f47d717504afbfdb305b45210 (patch)
treef457ecb10ef3812b1d4f0948cf7156e08244f214
parentc415d3569e4540a6480b6fe07c44bd976c2532e3 (diff)
parent2e997de5c8eedabc4a94b83efd40409adac547e8 (diff)
downloadbottle-a78fcdec7e8d507f47d717504afbfdb305b45210.tar.gz
Merge pull request #239 from bgreenlee/gunicorn-config
Allow options to be passed into GunicornServer (e.g. worker_class, worker
-rwxr-xr-xbottle.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bottle.py b/bottle.py
index db13ee2..d0a08c7 100755
--- a/bottle.py
+++ b/bottle.py
@@ -2133,11 +2133,12 @@ class GeventServer(ServerAdapter):
class GunicornServer(ServerAdapter):
- """ Untested. """
+ """ Untested. See http://gunicorn.org/configure.html for options. """
def run(self, handler):
from gunicorn.app.base import Application
- config = {'bind': "%s:%d" % (self.host, int(self.port)), 'workers': 4}
+ config = {'bind': "%s:%d" % (self.host, int(self.port))}
+ config.update(self.options)
class GunicornApplication(Application):
def init(self, parser, opts, args):