Skip to content

Commit 7196ed1

Browse files
authored
🧑‍💻 给错误日志加上 traceback (#14)
* 🧑‍💻 给错误日志加上 traceback * 🧑‍💻 WebSocketClosed 统一成 WARNING * 🧑‍💻 建立连接出错时不打印 traceback
1 parent 465c794 commit 7196ed1

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

nonebot_plugin_all4one/onebotimpl/__init__.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,13 @@ async def _ws_send(
217217
event = await queue.get()
218218
await websocket.send(encode_data(event.dict(), conn.use_msgpack))
219219
except WebSocketClosed as e:
220-
logger.opt(colors=True).log(
221-
"ERROR",
222-
"<r><bg #f8bbd0>WebSocket Closed</bg #f8bbd0></r>",
220+
logger.opt(colors=True, exception=e).log(
221+
"WARNING",
222+
"<y><bg #f8bbd0>WebSocket Closed</bg #f8bbd0></y>",
223223
e,
224224
)
225225
except Exception as e:
226-
logger.opt(colors=True).log(
226+
logger.opt(colors=True, exception=e).log(
227227
"ERROR",
228228
"<r><bg #f8bbd0>Error while process data from websocket"
229229
". Trying to reconnect...</bg #f8bbd0></r>",
@@ -247,13 +247,13 @@ async def _ws_recv(self, middleware: Middleware, websocket: WebSocket) -> None:
247247
if "echo" in data:
248248
resp["echo"] = data["echo"]
249249
await websocket.send(encode_data(resp, isinstance(raw_data, str)))
250-
except WebSocketClosed:
251-
logger.opt(colors=True).log(
250+
except WebSocketClosed as e:
251+
logger.opt(colors=True, exception=e).log(
252252
"WARNING",
253253
f"WebSocket for Bot {escape_tag(middleware.self_id)} closed by peer",
254254
)
255255
except Exception as e:
256-
logger.opt(colors=True).log(
256+
logger.opt(colors=True, exception=e).log(
257257
"ERROR",
258258
"<r><bg #f8bbd0>Error while process data from websocket "
259259
f"for bot {escape_tag(middleware.self_id)}.</bg #f8bbd0></r>",
@@ -434,23 +434,23 @@ async def _websocket_rev(
434434
await t2
435435
t1.cancel()
436436
except WebSocketClosed as e:
437-
logger.opt(colors=True).log(
438-
"ERROR",
439-
"<r><bg #f8bbd0>WebSocket Closed</bg #f8bbd0></r>",
437+
logger.opt(colors=True, exception=e).log(
438+
"WARNING",
439+
"<y><bg #f8bbd0>WebSocket Closed</bg #f8bbd0></y>",
440440
e,
441441
)
442442
except Exception as e:
443-
logger.opt(colors=True).log(
443+
logger.opt(colors=True, exception=e).log(
444444
"ERROR",
445445
"<r><bg #f8bbd0>Error while process data from websocket"
446446
f"{escape_tag(str(conn.url))}. Trying to reconnect...</bg #f8bbd0></r>",
447447
e,
448448
)
449449
except Exception as e:
450450
logger.opt(colors=True).log(
451-
"ERROR",
452-
"<r><bg #f8bbd0>Error while setup websocket to "
453-
f"{escape_tag(str(conn.url))}. Trying to reconnect...</bg #f8bbd0></r>",
451+
"WARNING",
452+
"<y><bg #f8bbd0>Error while setup websocket to "
453+
f"{escape_tag(str(conn.url))}. Trying to reconnect...</bg #f8bbd0></y>",
454454
e,
455455
)
456456
await asyncio.sleep(conn.reconnect_interval)

0 commit comments

Comments
 (0)