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

# Conflicts: # cps.py
2017-03-18 12:48:59 +00:00 · 2017-03-18 12:48:59 +00:00 · 907a2eca68
commit 907a2eca68
parent 3916205a95 806cb5d856
1 changed files with 1 additions and 0 deletions
--- a/cps.py
+++ b/cps.py
@ -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")