Merge branch 'master' into unstable

This commit is contained in:
Julien Duponchelle
2015-05-08 14:45:07 +02:00
27 changed files with 307 additions and 116 deletions

View File

@ -225,6 +225,10 @@ def run():
server = Server.instance(host, port)
try:
server.run()
except OSError as e:
# This is to ignore OSError: [WinError 0] The operation completed successfully exception on Windows.
if not sys.platform.startswith("win") and not e.winerror == 0:
raise
except Exception as e:
log.critical("Critical error while running the server: {}".format(e), exc_info=1)
CrashReport.instance().capture_exception()