summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2016-06-19 17:33:29 +0200
committerGitHub <noreply@github.com>2016-06-19 17:33:29 +0200
commitfbf641da04bc2c7abec08792c2a3b73bd31d87d7 (patch)
treea3db5b82524f714c8d0e8bfc5a73a511bfb4cef0
parent28275ca99bcf6296ceeabd7a8e7ca94cc4edb0c6 (diff)
parentedae7c4e1543a8fbf19ff236774afebe0c90e35a (diff)
downloadbottle-fbf641da04bc2c7abec08792c2a3b73bd31d87d7.tar.gz
Merge pull request #857 from dagnelies/patch-1
make it possible to provide a logger for gevent (before, the logger would be replaced by 'default')
-rw-r--r--bottle.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bottle.py b/bottle.py
index c2e3435..4c5a88a 100644
--- a/bottle.py
+++ b/bottle.py
@@ -3189,7 +3189,8 @@ class GeventServer(ServerAdapter):
msg = "Bottle requires gevent.monkey.patch_all() (before import)"
raise RuntimeError(msg)
if not self.options.pop('fast', None): wsgi = pywsgi
- self.options['log'] = None if self.quiet else 'default'
+ if self.quiet:
+ self.options['log'] = None
address = (self.host, self.port)
server = wsgi.WSGIServer(address, handler, **self.options)
if 'BOTTLE_CHILD' in os.environ: