summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2010-06-18 23:11:11 +0200
committerMarcel Hellkamp <marc@gsites.de>2010-06-18 23:11:11 +0200
commit64220991fee3791a4c8128537253ea3617450963 (patch)
treecb641d0e8fd25ad6d5858850153aa3af95927c93
parent98b5cef6d242bb997b29209ac3ed0c9ea7863cdf (diff)
downloadbottle-64220991fee3791a4c8128537253ea3617450963.tar.gz
fix: Calling run(quiet=True) broke some of the server adapters.
-rwxr-xr-xbottle.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/bottle.py b/bottle.py
index 30f518c..2d88602 100755
--- a/bottle.py
+++ b/bottle.py
@@ -1316,7 +1316,7 @@ class AutoServer(ServerAdapter):
def run(app=None, server=WSGIRefServer, host='127.0.0.1', port=8080,
- interval=1, reloader=False, **kargs):
+ interval=1, reloader=False, quiet=False, **kargs):
""" Runs bottle as a web server. """
app = app if app else default_app()
# Instantiate server, if it is a class instead of an instance
@@ -1324,8 +1324,8 @@ def run(app=None, server=WSGIRefServer, host='127.0.0.1', port=8080,
server = server(host=host, port=port, **kargs)
if not isinstance(server, ServerAdapter):
raise RuntimeError("Server must be a subclass of WSGIAdapter")
- quiet = kargs.get('quiet', False) or server.quiet
- if not quiet: # pragma: no cover
+ server.quiet = server.quiet or quiet
+ if not server.quiet: # pragma: no cover
if not reloader or os.environ.get('BOTTLE_CHILD') == 'true':
print "Bottle server starting up (using %s)..." % repr(server)
print "Listening on http://%s:%d/" % (server.host, server.port)
@@ -1339,7 +1339,7 @@ def run(app=None, server=WSGIRefServer, host='127.0.0.1', port=8080,
else:
server.run(app)
except KeyboardInterrupt:
- if not quiet: # pragma: no cover
+ if not server.quiet: # pragma: no cover
print "Shutting Down..."