Commit 907a2eca authored by Jack Darlington's avatar Jack Darlington

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

# Conflicts:
#	cps.py
parents 3916205a 806cb5d8
......@@ -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")
......
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