mirror of
https://github.com/xfgryujk/blivechat.git
synced 2024-12-26 04:41:40 +08:00
修复aiohttp的BUG导致的协程被异常取消
This commit is contained in:
parent
9663a77338
commit
104f0da94e
@ -1,4 +1,5 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import asyncio
|
||||
from typing import *
|
||||
|
||||
import aiohttp
|
||||
@ -16,9 +17,21 @@ http_session: Optional[aiohttp.ClientSession] = None
|
||||
|
||||
def init():
|
||||
global http_session
|
||||
http_session = aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=10))
|
||||
http_session = aiohttp.ClientSession(
|
||||
response_class=CustomClientResponse,
|
||||
timeout=aiohttp.ClientTimeout(total=10),
|
||||
)
|
||||
|
||||
|
||||
async def shut_down():
|
||||
if http_session is not None:
|
||||
await http_session.close()
|
||||
|
||||
|
||||
class CustomClientResponse(aiohttp.ClientResponse):
|
||||
# 因为aiohttp的BUG,当底层连接断开时,_wait_released可能会抛出CancelledError,导致上层协程结束。这里改个错误类型
|
||||
async def _wait_released(self):
|
||||
try:
|
||||
return await super()._wait_released()
|
||||
except asyncio.CancelledError as e:
|
||||
raise aiohttp.ClientConnectionError('Connection released') from e
|
||||
|
Loading…
Reference in New Issue
Block a user