rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove server global, use lambda instead

Browse Source
This commit is contained in:
Daniel Schadt 2015-11-20 16:13:30 +01:00
parent fb8f200291
commit 09e310277d
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/integration/webserver_sub.py
View File

@ -33,7 +33,6 @@ from httpbin.structures import CaseInsensitiveDict
import cherrypy.wsgiserver import cherrypy.wsgiserver
import flask import flask
server = None
@app.route('/data/<path:path>') @app.route('/data/<path:path>')
def send_data(path): def send_data(path):
@ -91,27 +90,19 @@ class WSGIServer(cherrypy.wsgiserver.CherryPyWSGIServer):
self._ready = value self._ready = value
def shutdown(*args):
"""Stop the server."""
if server is None:
return
server.stop()
def main(): def main():
global server
if hasattr(sys, 'frozen'): if hasattr(sys, 'frozen'):
basedir = os.path.realpath(os.path.dirname(sys.executable)) basedir = os.path.realpath(os.path.dirname(sys.executable))
app.template_folder = os.path.join(basedir, 'integration', 'templates') app.template_folder = os.path.join(basedir, 'integration', 'templates')
port = int(sys.argv[1]) port = int(sys.argv[1])
server = WSGIServer(('0.0.0.0', port), app) server = WSGIServer(('0.0.0.0', port), app)
signal.signal(signal.SIGTERM, shutdown) signal.signal(signal.SIGTERM, lambda *args: server.stop())
try: try:
server.start() server.start()
except KeyboardInterrupt: except KeyboardInterrupt:
shutdown() server.stop()
if __name__ == '__main__': if __name__ == '__main__':