fix: Revert custom aiohttp session and set aiodocker log timeout
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
This commit is contained in:
11
main.py
11
main.py
@@ -153,12 +153,8 @@ async def main():
|
|||||||
Monitors Navidrome container logs for rapid star/unstar events.
|
Monitors Navidrome container logs for rapid star/unstar events.
|
||||||
"""
|
"""
|
||||||
docker = None
|
docker = None
|
||||||
session = None
|
|
||||||
try:
|
try:
|
||||||
# Disable timeouts for the log stream, which can be idle for long periods.
|
docker = aiodocker.Docker()
|
||||||
timeout = aiohttp.ClientTimeout(total=None, sock_read=None)
|
|
||||||
session = aiohttp.ClientSession(timeout=timeout)
|
|
||||||
docker = aiodocker.Docker(session=session)
|
|
||||||
container = await docker.containers.get(settings.NAVIDROME_CONTAINER)
|
container = await docker.containers.get(settings.NAVIDROME_CONTAINER)
|
||||||
|
|
||||||
logging.info(f"Monitoring logs for container '{settings.NAVIDROME_CONTAINER}'...")
|
logging.info(f"Monitoring logs for container '{settings.NAVIDROME_CONTAINER}'...")
|
||||||
@@ -166,7 +162,8 @@ async def main():
|
|||||||
stdout=True,
|
stdout=True,
|
||||||
stderr=True,
|
stderr=True,
|
||||||
follow=True,
|
follow=True,
|
||||||
since=datetime.now(timezone.utc).timestamp()
|
since=datetime.now(timezone.utc).timestamp(),
|
||||||
|
timeout=0, # Disable timeout for long-polling
|
||||||
)
|
)
|
||||||
|
|
||||||
async for line in logs:
|
async for line in logs:
|
||||||
@@ -198,8 +195,6 @@ async def main():
|
|||||||
finally:
|
finally:
|
||||||
if docker:
|
if docker:
|
||||||
await docker.close()
|
await docker.close()
|
||||||
if session:
|
|
||||||
await session.close()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
Reference in New Issue
Block a user