CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: remove some excepts that were catching propagated cancellations.

Browse Source
This commit is contained in:
Upstream Data
2024-04-26 13:00:16 -06:00
parent bab4261bed
commit 5c79c6cb0c
1 changed files with 21 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pyasic/miners/factory.py
View File

@@ -541,15 +541,11 @@ class MinerFactory:
return await concurrent_get_first_result(tasks, lambda x: x is not None) return await concurrent_get_first_result(tasks, lambda x: x is not None)
async def _get_miner_web(self, ip: str) -> MinerTypes | None: async def _get_miner_web(self, ip: str) -> MinerTypes | None:
tasks = []
try:
urls = [f"http://{ip}/", f"https://{ip}/"] urls = [f"http://{ip}/", f"https://{ip}/"]
async with httpx.AsyncClient( async with httpx.AsyncClient(
transport=settings.transport(verify=False) transport=settings.transport(verify=False)
) as session: ) as session:
tasks = [ tasks = [asyncio.create_task(self._web_ping(session, url)) for url in urls]
asyncio.create_task(self._web_ping(session, url)) for url in urls
]
text, resp = await concurrent_get_first_result( text, resp = await concurrent_get_first_result(
tasks, tasks,
@@ -558,13 +554,6 @@ class MinerFactory:
) )
if text is not None: if text is not None:
return self._parse_web_type(text, resp) return self._parse_web_type(text, resp)
except asyncio.CancelledError:
for t in tasks:
t.cancel()
try:
await t
except asyncio.CancelledError:
pass
@staticmethod @staticmethod
async def _web_ping( async def _web_ping(
@@ -612,12 +601,8 @@ class MinerFactory:
return MinerTypes.AURADINE return MinerTypes.AURADINE
async def _get_miner_socket(self, ip: str) -> MinerTypes | None: async def _get_miner_socket(self, ip: str) -> MinerTypes | None:
tasks = []
try:
commands = ["version", "devdetails"] commands = ["version", "devdetails"]
tasks = [ tasks = [asyncio.create_task(self._socket_ping(ip, cmd)) for cmd in commands]
asyncio.create_task(self._socket_ping(ip, cmd)) for cmd in commands
]
data = await concurrent_get_first_result( data = await concurrent_get_first_result(
tasks, tasks,
@@ -626,13 +611,6 @@ class MinerFactory:
if data is not None: if data is not None:
d = self._parse_socket_type(data) d = self._parse_socket_type(data)
return d return d
except asyncio.CancelledError:
for t in tasks:
t.cancel()
try:
await t
except asyncio.CancelledError:
pass
@staticmethod @staticmethod
async def _socket_ping(ip: str, cmd: str) -> str | None: async def _socket_ping(ip: str, cmd: str) -> str | None: