administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-03-10 10:33:11 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Clean up trailing whitespaces in cpu stats process cmdline (#22089)

Browse Source 
The psutil library reads the process commandline as by opening
/proc/pid/cmdline which returns a buffer that is larger than just the
program cmdline due to rounded memory allocation sizes.

That means that if the library does not detect a Null-terminated string
it keeps appending empty strings which add up as whitespaces when joined.
This commit is contained in:
Martin Weinelt 2026-02-27 05:53:26 +01:00 committed by GitHub
parent 9c3a74b4f5
commit b4eac11cbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frigate/util/services.py
View File

@ -121,7 +121,7 @@ def get_cpu_stats() -> dict[str, dict]:
pid = str(process.info["pid"]) pid = str(process.info["pid"])
try: try:
cpu_percent = process.info["cpu_percent"] cpu_percent = process.info["cpu_percent"]
cmdline = process.info["cmdline"] cmdline = " ".join(process.info["cmdline"]).rstrip()
with open(f"/proc/{pid}/stat", "r") as f: with open(f"/proc/{pid}/stat", "r") as f:
stats = f.readline().split() stats = f.readline().split()
@ -155,7 +155,7 @@ def get_cpu_stats() -> dict[str, dict]:
"cpu": str(cpu_percent), "cpu": str(cpu_percent),
"cpu_average": str(round(cpu_average_usage, 2)), "cpu_average": str(round(cpu_average_usage, 2)),
"mem": f"{mem_pct}", "mem": f"{mem_pct}",
"cmdline": clean_camera_user_pass(" ".join(cmdline)), "cmdline": clean_camera_user_pass(cmdline),
} }
except Exception: except Exception:
continue continue