diff --git a/debian/changelog b/debian/changelog index 1647720..93013b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +omr-vps-admin (0.11+20240705) unstable; urgency=medium + + * psutil.cpu_freq only available in psutil >5.1.0 put request in a try/except block + + -- OpenMPTCProuter Fri, 05 Jul 2024 17:44:31 +0200 + omr-vps-admin (0.11+20240704) unstable; urgency=medium * Use subprocess for ss -M command diff --git a/omr-admin.py b/omr-admin.py index 3be0ecc..cd91173 100755 --- a/omr-admin.py +++ b/omr-admin.py @@ -1371,7 +1371,10 @@ async def status(userid: Optional[int] = Query(None), username: Optional[str] = vps_disk_used = vps_disk.used vps_disk_free = vps_disk.free vps_disk_percent = vps_disk.percent - vps_cpu_freq = psutil.cpu_freq().current + try: + vps_cpu_freq = psutil.cpu_freq().current + except: + vps_cpu_freq = None vps_cpu_model = os.popen("cat /proc/cpuinfo | awk -F: '/model name/ {print $2;exit}'").read().strip() vps_uptime = os.popen("cat /proc/uptime | awk '{print $1}'").read().rstrip() vps_hostname = socket.gethostname()