LinuxMonitor 1.4.2__tar.gz → 1.4.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.4.2
+Version: 1.4.4
 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.2/LinuxMonitor.egg-info → linuxmonitor-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.4.2
+Version: 1.4.4
 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.2 → linuxmonitor-1.4.4}/linuxmonitor/__main__.py

@@ -179,8 +179,14 @@ def main() -> None:
 
     if args.list_processes:
         handled = True
-        print("Listing active processes...")
-        out_msg: str = asyncio.run(monitoring.get_ordered_processes(get_non_consuming_processes=False))
+        print("Listing active processes (ordered by RAM usage)...")
+        out_msg: str = asyncio.run(monitoring.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=True))
+        print(out_msg)
+
+    if args.list_processes_order_by_cpu:
+        handled = True
+        print("Listing active processes (ordered by CPU usage)...")
+        out_msg: str = asyncio.run(monitoring.get_ordered_processes(get_non_consuming_processes=False, order_by_ram=False))
         print(out_msg)
 
     if args.kill_process is not None:

{linuxmonitor-1.4.2 → linuxmonitor-1.4.4}/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.2 (2024/10/07)"
+__version__ = "1.4.4 (2024/10/07)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -1672,11 +1672,12 @@ class LinuxMonitor:
 
     #region Processes
 
-    async def get_ordered_processes(self, get_non_consuming_processes: bool = False) -> str:
+    async def get_ordered_processes(self, get_non_consuming_processes: bool = False, order_by_ram: bool = True) -> str:
         """
         Get the ordered list of processes by memory and CPU usage.
 
         :param get_non_consuming_processes: If True, get all processes, otherwise only get processes consuming resources.
+        :param order_by_ram: If True, order by RAM usage, otherwise order by CPU usage.
 
         :return: A string containing the result message.
         """
@@ -1707,7 +1708,7 @@ class LinuxMonitor:
                         'pid': process.info['pid'],
                         'name': process.info['name'],
                         'username': process.info['username'],
-                        'cpu_percent': process.cpu_percent(interval=None),
+                        'cpu_percent': process.info['cpu_percent'],
                         'memory': process.info['memory_info'].rss,  # Resident Set Size (RSS) memory
                         'create_time': create_time,
                         'cmdline': cmdline
@@ -1716,7 +1717,7 @@ class LinuxMonitor:
                     pass
 
             # Sort processes by memory usage, then by CPU usage, both in descending order
-            processes.sort(key=lambda proc: (proc['memory'], proc['cpu_percent'], proc['create_time']), reverse=True) # type: ignore
+            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
 
             full_res: str = ""
             for proc in processes: # type: ignore

{linuxmonitor-1.4.2 → linuxmonitor-1.4.4}/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.2",
+    version="1.4.4",
     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",