LinuxMonitor 1.2.2__tar.gz → 1.2.5__tar.gz

{linuxmonitor-1.2.2 → linuxmonitor-1.2.5/LinuxMonitor.egg-info}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.2.2
+Version: 1.2.5
 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.2.2 → linuxmonitor-1.2.5}/linuxmonitor/linuxmonitor.py

@@ -30,7 +30,7 @@ __email__ = "quentin@comte-gaz.com"
 __license__ = "MIT License"
 __copyright__ = "Copyright Quentin Comte-Gaz (2024)"
 __python_version__ = "3.+"
-__version__ = "1.2.2 (2024/09/16)"
+__version__ = "1.2.5 (2024/09/16)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -179,7 +179,7 @@ class LinuxMonitor:
 
     #region Execute Command
 
-    async def execute_and_verify(self, command: List[str], display_name: str, timeout_in_sec: Optional[int] = None, display_only_if_critical: bool = False, check_also_stdout_not_containing: Optional[str] = None) -> Tuple[Optional[bool], str]:
+    async def execute_and_verify(self, command: List[str], display_name: str, show_only_std_and_exception: bool, timeout_in_sec: Optional[int] = None, display_only_if_critical: bool = False, check_also_stdout_not_containing: Optional[str] = None) -> Tuple[Optional[bool], str]:
         """
         Execute a shell command asynchronously and verify its correct execution.
 
@@ -211,7 +211,10 @@ class LinuxMonitor:
                 return None, f"⚠️ **Error {display_name}**:\n- Failed to execute the command in less than {timeout_in_sec} seconds)"
         except Exception as e:
             # Failed to execute the command
-            out_msg = f"⚠️ **Error {display_name}**:\n```sh\n{e}\n```"
+            if not show_only_std_and_exception:
+                out_msg = f"⚠️ **Error {display_name}**:\n```sh\n{e}\n```"
+            else:
+                out_msg = f"```sh\n{e}\n```"
             logging.exception(msg=out_msg)
             return None, out_msg
 
@@ -227,22 +230,25 @@ class LinuxMonitor:
         out_msg: str = ""
         if res == False:
             # Command returned an error code
-            out_msg = f"❌ **Error {display_name}**\n"
+            if not show_only_std_and_exception:
+                out_msg = f"❌ **Error {display_name}**\n"
             out_msg += f"- Error code: {returncode}"
 
             if stderr_str != "":
-                out_msg += f"- Error log:\n```sh\n{stderr_str}\n```"
+                out_msg += f"\n- Error log:\n```sh\n{stderr_str}\n```"
 
             if stdout_str != "":
-                out_msg += f"- Info:\n```sh\n{stdout_str}\n```"
+                out_msg += f"\n- Info:\n```sh\n{stdout_str}\n```"
         elif res == None:
             # Command timed out
-            out_msg = f"⚠️ **Error {display_name}**\n"
+            if not show_only_std_and_exception:
+                out_msg = f"⚠️ **Error {display_name}**\n"
             out_msg += f"- Failed to wait for the command to finish (due to timeout of {timeout_in_sec} seconds)"
         else:
             # Command executed successfully
             if not display_only_if_critical:
-                out_msg = f"✅ **{display_name} executed successfully**"
+                if not show_only_std_and_exception:
+                    out_msg = f"✅ **{display_name} executed successfully**"
 
         if res == True:
             logging.info(msg=f"Command {display_name} (command {command}) executed successfully")
@@ -264,7 +270,7 @@ class LinuxMonitor:
         IMPORTANT: To be usable, the user must have the right to execute `sudo /sbin/reboot` command without password.
         """
         logging.info(msg="Rebooting the server...")
-        _, out_msg = await self.execute_and_verify(command=["sudo", "/sbin/reboot"], display_name="Server reboot", timeout_in_sec=None, display_only_if_critical=False)
+        _, out_msg = await self.execute_and_verify(command=["sudo", "/sbin/reboot"], display_name="Server reboot", show_only_std_and_exception=False, timeout_in_sec=None, display_only_if_critical=False)
         return out_msg
 
     #endregion
@@ -747,7 +753,7 @@ class LinuxMonitor:
             display_name = f"[{display_name}](https://{website})"
 
             start_time: float = time.time()
-            res, out_msg = await self.execute_and_verify(command=ping_command, display_name=f"ping {display_name}", timeout_in_sec=timeout_in_sec, display_only_if_critical=display_only_if_critical)
+            res, out_msg = await self.execute_and_verify(command=ping_command, display_name=f"ping {display_name}", show_only_std_and_exception=False, timeout_in_sec=timeout_in_sec, display_only_if_critical=display_only_if_critical)
             end_time: float = time.time()
 
             if res == True and not display_only_if_critical:
@@ -938,13 +944,18 @@ class LinuxMonitor:
             logging.info(f"Trying to restart {display_name} (command: {service_call}) in less than {timeout_in_sec}sec...")
 
             start_time: float = time.time()
-            res, out_msg = await self.execute_and_verify(command=service_call, display_name=f"restart {display_name}", timeout_in_sec=timeout_in_sec, display_only_if_critical=False)
+            res, res_msg = await self.execute_and_verify(command=service_call, display_name=f"restart {display_name}", show_only_std_and_exception=True, timeout_in_sec=timeout_in_sec, display_only_if_critical=False)
             end_time: float = time.time()
 
             if res == True:
                 readable_duration: str = "{:.2f}".format(end_time - start_time)
                 out_msg = f"✅ **{display_name} restarted with success** in {readable_duration}sec."
                 logging.info(msg=out_msg)
+            else:
+                out_msg = f"❌ **Error restarting service {display_name}**"
+                if res_msg and res_msg != "":
+                    out_msg += f"\n{res_msg}"
+                logging.warning(msg=out_msg)
 
             return out_msg
         except Exception as e:
@@ -1004,7 +1015,7 @@ class LinuxMonitor:
             status_command = service['status_command']
             check_also_stdout_not_containing = service.get('check_also_stdout_not_containing', None)
 
-            res, out_msg = await self.execute_and_verify(command=status_command, display_name=f"état de {display_name}", timeout_in_sec=timeout_in_sec, display_only_if_critical=False, check_also_stdout_not_containing=check_also_stdout_not_containing)
+            res, out_msg = await self.execute_and_verify(command=status_command, display_name=f"état de {display_name}", show_only_std_and_exception=True, timeout_in_sec=timeout_in_sec, display_only_if_critical=False, check_also_stdout_not_containing=check_also_stdout_not_containing)
             return res, out_msg
         except Exception as e:
             out_msg = f"⚠️ **Error checking status of service {service_name}**:\n```sh\n{e}\n```"
@@ -1065,10 +1076,11 @@ class LinuxMonitor:
         out_msg_full: str = ""
         try:
             for service_name in self.config["services"].keys():
+                out_msg: str = ""
                 if is_private or self.config["services"][service_name]['is_private'] == is_private:
                     status, status_msg = await self._get_service_status(is_private=is_private, service_name=service_name)
                     if status is False:
-                        out_msg: str = f"❌ **{self.config['services'][service_name]['display_name']} inactive**. Restarting the service is necessary."
+                        out_msg = f"❌ **{self.config['services'][service_name]['display_name']} inactive**. Restarting the service is necessary."
                         logging.warning(msg=out_msg)
                         if status_msg != "":
                             out_msg += f"\n{status_msg}"
@@ -1644,7 +1656,7 @@ class LinuxMonitor:
 
             # Attempt to terminate the process
             terminate_command: List[str] = ['sudo', '/bin/kill', '-TERM', str(pid)]
-            result_terminate, _ = await self.execute_and_verify(command=terminate_command, display_name=f"stop process {pid} ({process_name})", timeout_in_sec=timeout_in_sec, display_only_if_critical=False)
+            result_terminate, _ = await self.execute_and_verify(command=terminate_command, display_name=f"stop process {pid} ({process_name})", show_only_std_and_exception=False, timeout_in_sec=timeout_in_sec, display_only_if_critical=False)
 
             if result_terminate == True:
                 out_msg = f"✅ **Process {pid} ({process_name}) stopped with success** (nicely)).\n"
@@ -1656,7 +1668,7 @@ class LinuxMonitor:
 
                 # Attempt to kill the process
                 kill_command = ['sudo', '/bin/kill', '-KILL', str(pid)]
-                _, strerror_kill = await self.execute_and_verify(command=kill_command, display_name=f"kill process {pid} ({process_name})", timeout_in_sec=timeout_in_sec, display_only_if_critical=False)
+                _, strerror_kill = await self.execute_and_verify(command=kill_command, display_name=f"kill process {pid} ({process_name})", show_only_std_and_exception=True, timeout_in_sec=timeout_in_sec, display_only_if_critical=False)
                 out_msg += strerror_kill
 
             if process_cpu_percent > 0:

{linuxmonitor-1.2.2 → linuxmonitor-1.2.5}/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.2.2",
+    version="1.2.5",
     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",