Commit 089a85d7 authored by Jack Darlington's avatar Jack Darlington

Merge branch 'develop' into personal

# Conflicts:
#	cps.py
parents 21b1a450 4b59eab3
...@@ -14,12 +14,19 @@ from cps import web ...@@ -14,12 +14,19 @@ from cps import web
from tornado.wsgi import WSGIContainer from tornado.wsgi import WSGIContainer
from tornado.httpserver import HTTPServer from tornado.httpserver import HTTPServer
from tornado.ioloop import IOLoop from tornado.ioloop import IOLoop
from gevent.wsgi import WSGIServer
if __name__ == '__main__': if __name__ == '__main__':
if web.ub.DEVELOPMENT: if web.ub.DEVELOPMENT:
web.app.run(host="0.0.0.0", port=web.ub.config.config_port, debug=True) web.app.run(host="0.0.0.0", port=web.ub.config.config_port, debug=True)
else: else:
web.app.run(host="0.0.0.0", port=web.ub.config.config_port) if len(sys.argv) > 1 and sys.argv[1] == '-g':
http_server = WSGIServer(('', web.ub.config.config_port), web.app)
http_server.serve_forever()
else:
http_server = HTTPServer(WSGIContainer(web.app))
http_server.listen(web.ub.config.config_port)
IOLoop.instance().start()
if web.helper.global_task == 0: if web.helper.global_task == 0:
web.app.logger.info("Performing restart of Calibre-web") web.app.logger.info("Performing restart of Calibre-web")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment