Jonathan/calibre-web
1
0
Fork 0
mirror of https://github.com/JonathanHerrewijnen/calibre-web.git synced 2024-11-11 13:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into personal

Browse Source 
# Conflicts:
#	cps.py
This commit is contained in:
Jack Darlington 2017-03-07 22:39:20 +00:00
commit 089a85d771
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cps.py
View File

@ -14,12 +14,19 @@ from cps import web
from tornado.wsgi import WSGIContainer
from tornado.httpserver import HTTPServer
from tornado.ioloop import IOLoop
from gevent.wsgi import WSGIServer
if __name__ == '__main__':
if web.ub.DEVELOPMENT:
web.app.run(host="0.0.0.0", port=web.ub.config.config_port, debug=True)
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:
web.app.logger.info("Performing restart of Calibre-web")