ChaoticByte/argh
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve logging

Browse source
This commit is contained in:
ChaoticByte 2025-09-27 08:05:21 +02:00
parent af22b02442
commit 0f470396df
No known key found for this signature in database
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
argh/node.py
View file

@ -38,39 +38,39 @@ class Node:
while len(self._known_hashes) > self.max_known_hashes_size: while len(self._known_hashes) > self.max_known_hashes_size:
self._known_hashes.pop(0) self._known_hashes.pop(0)
async def _receiver_connection(self, r: NodeAddr): async def _conn_to_receiver(self, r: NodeAddr):
identifier = r.identifier() identifier = r.identifier()
log("Attempting to connect to receiver", identifier)
async for ws in connect(r.ws_uri()): async for ws in connect(r.ws_uri()):
log(identifier) log("Connected to receiver", identifier)
self._connections[identifier] = ws self._connections[identifier] = ws
try: try:
async for msg in ws: async for msg in ws:
log(msg)
self._relay(msg) self._relay(msg)
except (ConnectionClosed, ConnectionClosedError): except (ConnectionClosed, ConnectionClosedError):
del self._connections[identifier] del self._connections[identifier]
log(f"Connection from {identifier} closed", 1) log(f"Lost connection to receiver", identifier, level=1)
continue continue
async def _server_connection(self, ws: ServerConnection): async def _conn_from_node_or_client(self, ws: ServerConnection):
host, port = ws.remote_address host, port = ws.remote_address
addr = NodeAddr(host, port) addr = NodeAddr(host, port)
identifier = addr.identifier() identifier = addr.identifier()
self._connections[identifier] = ws self._connections[identifier] = ws
log(identifier) log("Accepted connection", identifier)
async for msg in ws: async for msg in ws:
log(msg)
self._relay(msg) self._relay(msg)
log("Lost connection", identifier)
del self._connections[identifier] del self._connections[identifier]
async def run(self): async def run(self):
# connect to receivers # connect to receivers
receiver_tasks = [] receiver_tasks = []
for r in self.receivers: for r in self.receivers:
t = asyncio.create_task(self._receiver_connection(r)) t = asyncio.create_task(self._conn_to_receiver(r))
receiver_tasks.append(t) receiver_tasks.append(t)
# server loop # server loop
async with serve(self._server_connection, self.listen_address.host, self.listen_address.port) as server: async with serve(self._conn_from_node_or_client, self.listen_address.host, self.listen_address.port) as server:
await server.serve_forever() await server.serve_forever()
# wait for receivers # wait for receivers
await asyncio.gather(receiver_tasks) await asyncio.gather(receiver_tasks)