LinuxMonitor 1.2.4__tar.gz → 1.2.6__tar.gz

{linuxmonitor-1.2.4 → linuxmonitor-1.2.6/LinuxMonitor.egg-info}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.2.4
+Version: 1.2.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.2.4 → linuxmonitor-1.2.6}/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.3 (2024/09/16)"
+__version__ = "1.2.6 (2024/09/16)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -232,13 +232,13 @@ class LinuxMonitor:
             # Command returned an error code
             if not show_only_std_and_exception:
                 out_msg = f"❌ **Error {display_name}**\n"
-            out_msg += f"- Error code: {returncode}"
+            out_msg += f" - Error code: `{returncode}`"
 
             if stderr_str != "":
-                out_msg += f"\n- 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"\n- Info:\n```sh\n{stdout_str}\n```"
+                out_msg += f"\n - Info:\n```sh\n{stdout_str}\n```"
         elif res == None:
             # Command timed out
             if not show_only_std_and_exception:
@@ -944,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}", show_only_std_and_exception=False, 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:
@@ -1071,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}"
@@ -1082,13 +1088,16 @@ class LinuxMonitor:
                         out_msg_full += out_msg + "\n"
                         out_msg_full += await self.restart_service(is_private=is_private, service_name=service_name) + "\n"
                     elif status is None:
-                        out_msg: str = f"⚠️ **Error checking status of {self.config['services'][service_name]['display_name']}** (not restarting it)."
+                        out_msg: str = f"- ⚠️ **Error checking status of {self.config['services'][service_name]['display_name']}** (not restarting it)."
                         logging.error(msg=out_msg)
                         out_msg_full += out_msg + "\n"
         except Exception as e:
-            out_msg_full = f"**Internal error during service status check.**:\n```sh\n{e}\n```"
+            out_msg_full = f"- **Internal error during service status check.**:\n```sh\n{e}\n```"
             logging.exception(msg=out_msg_full)
 
+        if out_msg_full != "":
+            out_msg_full = f"# 📱 Services status 📱\n{out_msg_full}"
+
         return out_msg_full
 
     #endregion

{linuxmonitor-1.2.4 → linuxmonitor-1.2.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.2.4",
+    version="1.2.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",