LinuxMonitor 1.4.4__tar.gz → 1.4.6__tar.gz

{linuxmonitor-1.4.4 → linuxmonitor-1.4.6/LinuxMonitor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.4.4
+Version: 1.4.6
 Summary: Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)
 Home-page: https://github.com/QuentinCG/Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz

{linuxmonitor-1.4.4/LinuxMonitor.egg-info → linuxmonitor-1.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.4.4
+Version: 1.4.6
 Summary: Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)
 Home-page: https://github.com/QuentinCG/Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz

{linuxmonitor-1.4.4 → linuxmonitor-1.4.6}/linuxmonitor/linuxmonitor.py

@@ -33,7 +33,7 @@ __email__ = "quentin@comte-gaz.com"
 __license__ = "MIT License"
 __copyright__ = "Copyright Quentin Comte-Gaz (2024)"
 __python_version__ = "3.+"
-__version__ = "1.4.4 (2024/10/07)"
+__version__ = "1.4.6 (2024/10/07)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -1691,7 +1691,12 @@ class LinuxMonitor:
                     dummy_process.cpu_percent(interval=None)
                 except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
                     continue
-            await asyncio.sleep(delay=1)
+
+            if order_by_ram:
+                await asyncio.sleep(delay=1)
+            else:
+                # Let's get more accurate CPU percent values if we are ordering by CPU usage
+                await asyncio.sleep(delay=5)
 
             # Then we can get the processes
             for process in psutil.process_iter(['pid', 'name', 'username', 'cpu_percent', 'memory_info', 'create_time', 'cmdline']):
@@ -1717,7 +1722,9 @@ class LinuxMonitor:
                     pass
 
             # Sort processes by memory usage, then by CPU usage, both in descending order
-            processes.sort(key=lambda proc: (order_by_ram ? proc['memory']: proc['cpu_percent'], order_by_ram ? proc['cpu_percent']: proc['memory'], proc['create_time']), reverse=True) # type: ignore
+            processes.sort(key=lambda proc: (proc['memory'] if order_by_ram else proc['cpu_percent'], # type: ignore
+                                            proc['cpu_percent'] if order_by_ram else proc['memory'],
+                                            proc['create_time']), reverse=True)
 
             full_res: str = ""
             for proc in processes: # type: ignore

{linuxmonitor-1.4.4 → linuxmonitor-1.4.6}/setup.py

@@ -6,7 +6,7 @@ with io.open(file='README.md', mode='r', encoding='utf-8') as readme_file:
 
 setup(
     name="LinuxMonitor",
-    version="1.4.4",
+    version="1.4.6",
     description="Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)",
     long_description=readme,
     long_description_content_type="text/markdown",