Skip to content

Commit abfced4

Browse files
GitHKAndrei Neaguodeimaiz
authored
Making services more debuggable (#1690)
* fixes an issue with missing logs from container * updated error message * maked debugging easier when container fails * triggering ci agian * fix previous Co-authored-by: Andrei Neagu <[email protected]> Co-authored-by: Odei Maiz <[email protected]>
1 parent e23b47d commit abfced4

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

services/sidecar/src/simcore_service_sidecar/executor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ async def run(self):
7474
await self._post_messages(
7575
LogType.LOG, "[sidecar]...task completed successfully."
7676
)
77-
except exceptions.SidecarException:
78-
await self._post_messages(LogType.LOG, "[sidecar]...task failed.")
77+
except exceptions.SidecarException as e:
78+
await self._post_messages(LogType.LOG, f"[sidecar]...task failed: {str(e)}")
7979
raise
8080

8181
async def preprocess(self):

services/sidecar/src/simcore_service_sidecar/log_parser.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import re
44
from enum import Enum
55
from pathlib import Path
6+
import aiodocker
67
from typing import Awaitable, Callable, Tuple, Union
78

89
import aiofiles
@@ -78,8 +79,14 @@ async def monitor_logs_task(
7879
async def _monitor_docker_container(
7980
container: DockerContainer, log_cb: Awaitable[Callable[[LogType, str], None]]
8081
) -> None:
81-
async for line in container.log(stdout=True, stderr=True, follow=True):
82-
log_type, parsed_line = await parse_line(line)
82+
try:
83+
async for line in container.log(stdout=True, stderr=True, follow=True):
84+
log_type, parsed_line = await parse_line(line)
85+
except aiodocker.exceptions.DockerError as e:
86+
log_type, parsed_line = await parse_line(
87+
f"Could not recover logs because: {str(e)}"
88+
)
89+
finally:
8390
await log_cb(log_type, parsed_line)
8491

8592

0 commit comments

Comments
 (0)