Skip to content

Commit 457dff7

Browse files
committed
chore: 优化在 Windows 下 anyio accept socket 失败的问题
1 parent 234459b commit 457dff7

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

core/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,10 @@ async def main():
9292

9393
# serve
9494
await clusters.serve()
95-
95+
except asyncio.CancelledError:
96+
...
9697
except:
97-
logger.debug_traceback()
98+
logger.traceback()
9899

99100
finally:
100101
await clusters.stop()

core/cluster.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ async def keepalive(self):
243243
if res.err is not None or res.ack is None or not isinstance(res.ack, str):
244244
self._failed_keepalive += 1
245245
if self._failed_keepalive >= 3:
246-
logger.terror("cluster.kicked", id=self.id)
246+
logger.terror("cluster.kicked", id=self.id, name=self.display_name)
247247
await self.disable()
248248
else:
249249
logger.twarning("cluster.keepalive", id=self.id, name=self.display_name, failed=self._failed_keepalive)
@@ -695,7 +695,6 @@ async def fetch_cluster_name(self):
695695
"/openbmclapi/metric/rank"
696696
) as response:
697697
for resp_cluster in await response.json():
698-
print(resp_cluster)
699698
id = resp_cluster["_id"]
700699
name = resp_cluster["name"]
701700
if id in self._clusters:
@@ -720,7 +719,12 @@ async def get_response_file(self, hash: str) -> ResponseFile:
720719
return ResponseFile(
721720
0
722721
)
723-
return await storage.get_response_file(hash)
722+
try:
723+
return await storage.get_response_file(hash)
724+
except:
725+
return ResponseFile(
726+
0
727+
)
724728

725729
async def get_measure_file(self, size: int) -> ResponseFile:
726730
if not self.storages._online_storages:

core/web.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ async def pub_listener(
6565
)
6666

6767
tls_listener = streams.AutoTLSListener(
68-
listener,
68+
streams.FixedSocketListener(
69+
listener
70+
),
6971
)
7072
task_group.start_soon(serve, tls_listener)
7173

@@ -92,7 +94,6 @@ async def pub_handler(
9294
except Exception as e:
9395
logger.debug_traceback()
9496

95-
9697
async def forward(
9798
sock: streams.BufferedByteStream,
9899
port: int,

0 commit comments

Comments
 (0)