From 8c0230462c338c648b1dc1ed20871fa1cd098a9f Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Sun, 31 Jan 2016 15:36:28 +0100
Subject: [PATCH] Fix logs in exception catcher
---
src/sakia/core/net/node.py | 2 +-
src/sakia/main.py | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/sakia/core/net/node.py b/src/sakia/core/net/node.py
index f1f2d4b5..fe2d5c2a 100644
--- a/src/sakia/core/net/node.py
+++ b/src/sakia/core/net/node.py
@@ -204,7 +204,7 @@ class Node(QObject):
def close_ws(self):
for ws in self._ws_connection.values():
if ws:
- asyncio.wait_for(ws.close(), timeout=15)
+ asyncio.as_completed(ws.close(), timeout=15)
@property
def pubkey(self):
diff --git a/src/sakia/main.py b/src/sakia/main.py
index 8058c332..07fc4b84 100755
--- a/src/sakia/main.py
+++ b/src/sakia/main.py
@@ -50,10 +50,11 @@ def async_exception_handler(loop, context):
for ignored in ("Unclosed", "socket.gaierror"):
if ignored in line:
return
- for line in traceback.format_exception(*exc_info):
- for ignored in ("Unclosed", "socket.gaierror"):
- if ignored in line:
- return
+ if exc_info:
+ for line in traceback.format_exception(*exc_info):
+ for ignored in ("Unclosed", "socket.gaierror"):
+ if ignored in line:
+ return
os._exit(1)
--
GitLab