Merge branch 'master' of https://github.com/janeczku/calibre-web into develop

# Conflicts:
#	cps.py
This commit is contained in:
Jack Darlington 2017-03-18 12:48:59 +00:00
commit 907a2eca68

1
cps.py
View File

@ -28,6 +28,7 @@ if __name__ == '__main__':
http_server = HTTPServer(WSGIContainer(web.app))
http_server.listen(web.ub.config.config_port)
IOLoop.instance().start()
IOLoop.instance().close(True)
if web.helper.global_task == 0:
web.app.logger.info("Performing restart of Calibre-web")