Compare commits

...

1 Commits

Author SHA1 Message Date
Evan Quiney
ba611f9cd0 Revert "report macmon failures more aggressively (#1618)" (#1625)
this pr broke macmon - revert it
2026-02-25 19:15:55 +00:00

View File

@@ -542,13 +542,10 @@ class InfoGatherer:
if not p.stdout:
logger.critical("MacMon closed stdout")
return
t = TextReceiveStream(BufferedByteReceiveStream(p.stdout))
while True:
with anyio.fail_after(self.macmon_interval * 3):
macmon_output = await t.receive()
await self.info_sender.send(
MacmonMetrics.from_raw_json(macmon_output)
)
async for text in TextReceiveStream(
BufferedByteReceiveStream(p.stdout)
):
await self.info_sender.send(MacmonMetrics.from_raw_json(text))
except CalledProcessError as e:
stderr_msg = "no stderr"
stderr_output = cast(bytes | str | None, e.stderr)
@@ -559,12 +556,8 @@ class InfoGatherer:
else str(stderr_output)
)
logger.warning(
f"memory monitor failed with return code {e.returncode}: {stderr_msg}"
)
except TimeoutError:
logger.warning(
f"memory monitor silent for {self.macmon_interval * 3}s - reloading"
f"MacMon failed with return code {e.returncode}: {stderr_msg}"
)
except Exception as e:
logger.opt(exception=e).warning("Error in memory monitor")
logger.warning(f"Error in macmon monitor: {e}")
await anyio.sleep(self.macmon_interval)