LinuxMonitor 1.2.7__tar.gz → 1.3.0__tar.gz

{linuxmonitor-1.2.7 → linuxmonitor-1.3.0/LinuxMonitor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.2.7
+Version: 1.3.0
 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
@@ -61,6 +61,7 @@ Additionnal functionalities:
   - Get processes list (PID and name)
   - Kill a process by PID
   - Reboot server
+  - Restart/stop a service
 
 ## How to install (python script and shell)
 
@@ -84,7 +85,7 @@ echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /etc/init.d/mariadb" >> /etc/sudoers.d/U
 
 ## How to use in shell
 
-```shell
+```sh
 # Get help
 python3 -m linuxmonitor --help
 # Use "--debug" to show more information during command
@@ -135,6 +136,9 @@ python3 -m linuxmonitor --restart_all --config_file config-example.json --nodebu
 # Restart a service
 python3 -m linuxmonitor --restart_service SERVICE_NAME_HERE --config_file config-example.json --nodebug
 
+# Stop a service
+python3 -m linuxmonitor --stop_service SERVICE_NAME_HERE --config_file config-example.json --nodebug
+
 # Check ports
 python3 -m linuxmonitor --ports --config_file config-example.json --nodebug
 

{linuxmonitor-1.2.7/LinuxMonitor.egg-info → linuxmonitor-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.2.7
+Version: 1.3.0
 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
@@ -61,6 +61,7 @@ Additionnal functionalities:
   - Get processes list (PID and name)
   - Kill a process by PID
   - Reboot server
+  - Restart/stop a service
 
 ## How to install (python script and shell)
 
@@ -84,7 +85,7 @@ echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /etc/init.d/mariadb" >> /etc/sudoers.d/U
 
 ## How to use in shell
 
-```shell
+```sh
 # Get help
 python3 -m linuxmonitor --help
 # Use "--debug" to show more information during command
@@ -135,6 +136,9 @@ python3 -m linuxmonitor --restart_all --config_file config-example.json --nodebu
 # Restart a service
 python3 -m linuxmonitor --restart_service SERVICE_NAME_HERE --config_file config-example.json --nodebug
 
+# Stop a service
+python3 -m linuxmonitor --stop_service SERVICE_NAME_HERE --config_file config-example.json --nodebug
+
 # Check ports
 python3 -m linuxmonitor --ports --config_file config-example.json --nodebug
 

{linuxmonitor-1.2.7 → linuxmonitor-1.3.0}/README.md

@@ -33,6 +33,7 @@ Additionnal functionalities:
   - Get processes list (PID and name)
   - Kill a process by PID
   - Reboot server
+  - Restart/stop a service
 
 ## How to install (python script and shell)
 
@@ -56,7 +57,7 @@ echo "USERNAME_HERE ALL=(ALL) NOPASSWD: /etc/init.d/mariadb" >> /etc/sudoers.d/U
 
 ## How to use in shell
 
-```shell
+```sh
 # Get help
 python3 -m linuxmonitor --help
 # Use "--debug" to show more information during command
@@ -107,6 +108,9 @@ python3 -m linuxmonitor --restart_all --config_file config-example.json --nodebu
 # Restart a service
 python3 -m linuxmonitor --restart_service SERVICE_NAME_HERE --config_file config-example.json --nodebug
 
+# Stop a service
+python3 -m linuxmonitor --stop_service SERVICE_NAME_HERE --config_file config-example.json --nodebug
+
 # Check ports
 python3 -m linuxmonitor --ports --config_file config-example.json --nodebug
 

{linuxmonitor-1.2.7 → linuxmonitor-1.3.0}/linuxmonitor/__main__.py

@@ -23,6 +23,7 @@ def main() -> None:
     parser.add_argument('--services_status', action='store_true', help='🩺 Check services are running 🩺')
     parser.add_argument('--restart_all', action='store_true', help='🚀 Restart all services 🚀')
     parser.add_argument('--restart_service', type=str, help='🚀 Restart a service 🚀')
+    parser.add_argument('--stop_service', type=str, help='🚫 Stop a service 🚫')
     parser.add_argument('--list_services', action='store_true', help='📋 List all available services 📋')
     parser.add_argument('--ports', action='store_true', help='🔒 Check ports 🔒')
     parser.add_argument('--list_processes', action='store_true', help='📋 List active processes 📋')
@@ -123,7 +124,7 @@ def main() -> None:
     if args.services_status:
         handled = True
         print("Checking if services are running and restart if down...")
-        out_msg: str = asyncio.run(monitoring.check_all_services_status_and_restart_if_down(is_private=True))
+        out_msg: str = asyncio.run(monitoring.check_all_services_status(is_private=True, display_only_if_critical=False))
         print(out_msg)
 
     if args.restart_all:
@@ -134,19 +135,25 @@ def main() -> None:
     if args.restart_service is not None:
         handled = True
         print(f"Restarting service: {args.restart_service}...")
-        out_msg: str = asyncio.run(monitoring.restart_service(is_private=True, service_name=args.restart_service))
+        out_msg: str = asyncio.run(monitoring.restart_service(is_private=True, service_name=args.restart_service, force_restart=True))
+        print(out_msg)
+
+    if args.stop_service is not None:
+        handled = True
+        print(f"Stopping service: {args.stop_service}...")
+        out_msg: str = asyncio.run(monitoring.stop_service(is_private=True, service_name=args.stop_service))
         print(out_msg)
 
     if args.list_services:
         handled = True
         print("Listing all available services...")
-        out_msg: str = monitoring.get_all_services_allowed_to_restart(is_private=True)
+        out_msg: str = monitoring.get_all_services(is_private=True)
         print(out_msg)
 
     if args.ports:
         handled = True
         print("Checking ports...")
-        out_msg: str = asyncio.run(monitoring.check_all_ports(is_private=True, display_only_if_critical=False, restart_if_down=False))
+        out_msg: str = asyncio.run(monitoring.check_all_ports(is_private=True, display_only_if_critical=False))
         print(out_msg)
 
     if args.list_processes:

{linuxmonitor-1.2.7 → linuxmonitor-1.3.0}/linuxmonitor/linuxmonitor.py

@@ -16,6 +16,9 @@ Non exhaustive list of features (available by using it in shell or in python scr
     - Check last user connections IPs
     - Check uptime (to inform if the server has been rebooted)
 
+    - Restart/stop a service
+    - List all services
+
     - Get hostname, OS details, kernel version, server datetime, uptime
     - Get connected users
 
@@ -30,7 +33,7 @@ __email__ = "quentin@comte-gaz.com"
 __license__ = "MIT License"
 __copyright__ = "Copyright Quentin Comte-Gaz (2024)"
 __python_version__ = "3.+"
-__version__ = "1.2.7 (2024/09/16)"
+__version__ = "1.3.0 (2024/09/19)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -179,7 +182,7 @@ class LinuxMonitor:
 
     #region Execute Command
 
-    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]:
+    async def execute_and_verify(self, command: 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.
 
@@ -195,11 +198,11 @@ class LinuxMonitor:
 
         try:
             logging.debug(msg=f"Executing command {display_name} (command: {command})...")
-            process = await asyncio.create_subprocess_exec(
-                *command,
+            process = await asyncio.create_subprocess_shell(
+                command,
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
-                shell=False
+                shell=True
             )
 
             try:
@@ -270,7 +273,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", show_only_std_and_exception=False, 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
@@ -749,7 +752,7 @@ class LinuxMonitor:
         :return: A string containing the result message.
         """
         try:
-            ping_command: list[str] = ["ping", "-c", "1", website]
+            ping_command: str = f"ping -c 1 {website}"
             display_name = f"[{display_name}](https://{website})"
 
             start_time: float = time.time()
@@ -795,7 +798,10 @@ class LinuxMonitor:
 
     #region Check website response
 
-    async def _check_website(self, url: str, display_name: str, timeout_in_sec: int = 5, auth_type: Optional[str] = None, username: Optional[str] = None, password: Optional[str] = None, token: Optional[str] = None, additional_allowed_statuses: List[int] = [], display_only_if_critical: bool=False) -> Tuple[bool, str]:
+    async def _check_website(self, url: str, display_name: str, show_content_if_issue: bool, service_name: str = "",
+                             timeout_in_sec: int = 5, auth_type: Optional[str] = None, username: Optional[str] = None,
+                             password: Optional[str] = None, token: Optional[str] = None, additional_allowed_statuses: List[int] = [],
+                             display_only_if_critical: bool=False) -> Tuple[bool, str]:
         try:
             display_name = f"[{display_name}]({url})"
 
@@ -834,9 +840,11 @@ class LinuxMonitor:
                         # Get the reason phrase (e.g., "Unauthorized" for 401)
                         status_reason: str = responses.get(response.status, "Unknown status")
                         out_msg = f"❌ **{display_name} answered with invalid status code {response.status} - {status_reason}**."
+                        if show_content_if_issue:
+                            content: str = (await response.text()).replace('`', '"').strip()
+                            out_msg += f"\n```sh\n{content}\n```"
                         logging.warning(msg=out_msg)
                         return False, out_msg
-
         except asyncio.TimeoutError:
             out_msg = f"⚠️ **Error checking {display_name}: Timeout**"
             return False, out_msg
@@ -852,22 +860,28 @@ class LinuxMonitor:
                     timeout_in_sec: int = website_config.get('timeout_in_sec', 5)
                     url: str = website_config['url']
                     display_name: str = website_config.get('display_name', url)
+                    show_content_if_issue: bool = website_config.get('show_content_if_issue', False)
+                    service_name_to_restart: str = website_config.get('service_name_to_restart', "")
                     auth_type: Optional[str] = website_config.get('auth_type', None)
                     username: Optional[str] = website_config.get('username', None)
                     password: Optional[str] = website_config.get('password', None)
                     token: Optional[str] = website_config.get('token', None)
                     additional_allowed_statuses: List[int] = website_config.get('additional_allowed_statuses', [])
 
-                    _, msg = await self._check_website(url=url, display_name=display_name, timeout_in_sec=timeout_in_sec,
-                                                                  auth_type=auth_type, username=username, password=password, token=token,
-                                                                  additional_allowed_statuses=additional_allowed_statuses,
-                                                                  display_only_if_critical=display_only_if_critical)
-
+                    res, msg = await self._check_website(url=url, display_name=display_name, timeout_in_sec=timeout_in_sec,
+                                                       show_content_if_issue=show_content_if_issue,
+                                                       auth_type=auth_type, username=username, password=password, token=token,
+                                                       additional_allowed_statuses=additional_allowed_statuses,
+                                                       display_only_if_critical=display_only_if_critical)
                     if msg != "":
                         if out_msg:
                             out_msg += "\n"
                         out_msg += f"- {msg}"
 
+                    if not res and service_name_to_restart != "":
+                        restart_msg = await self.restart_service(is_private=is_private, service_name=service_name_to_restart, force_restart=False)
+                        out_msg += f"\n - {restart_msg}"
+
             if out_msg != "":
                 out_msg = f"# 🌐 Website access state 🌐\n{out_msg}"
 
@@ -881,7 +895,7 @@ class LinuxMonitor:
 
     #region Services
 
-    def get_all_services_allowed_to_restart(self, is_private: bool) -> str:
+    def get_all_services(self, is_private: bool) -> str:
         """
         Get all services allowed to restart which are configured in the JSON configuration file.
 
@@ -894,12 +908,24 @@ class LinuxMonitor:
             service = self.config['services'][service_name]
             if is_private or service['is_private'] == is_private:
                 is_allowed_to_restart: bool = 'restart_command' in service
+                is_allowed_to_stop: bool = 'stop_command' in service
+                auto_restart: bool = service.get('force_restart', False)
 
                 if out_msg != "":
                     out_msg += "\n"
-                out_msg += f"- `{service_name}`: {service['display_name']}"
+                out_msg += f"- `{service_name}`: {service['display_name']}:\n"
                 if not is_allowed_to_restart:
-                    out_msg += " (❌ Not authorized to restart)"
+                    out_msg += " - ❌ Not authorized to restart (no 'restart_command')\n"
+                else:
+                    if auto_restart:
+                        out_msg += " - ✅ Can be restarted (automatically & manually)\n"
+                    else:
+                        out_msg += " - ✅ Can be restarted (manually only because 'force_restart' = false)\n"
+
+                if is_allowed_to_stop:
+                    out_msg += " - ✅ Can be stopped manually"
+                else:
+                    out_msg += " - ❌ Not authorized to stop manually (no 'stop_command')"
 
         if out_msg != "":
             out_msg = f"# 🔄 Services list 🔄\n{out_msg}"
@@ -909,7 +935,7 @@ class LinuxMonitor:
         logging.info(msg=out_msg)
         return out_msg
 
-    async def restart_service(self, is_private: bool, service_name: str) -> str:
+    async def restart_service(self, is_private: bool, service_name: str, force_restart: bool) -> str:
         """
         Restart a specific service.
 
@@ -936,9 +962,14 @@ class LinuxMonitor:
                 logging.error(msg=out_msg)
                 return out_msg
 
+            if not force_restart and not service.get('force_restart', False):
+                out_msg = f"⚠️ **Service {service_name} can be restarted only manually** (change configuration if needed)."
+                logging.error(msg=out_msg)
+                return out_msg
+
             timeout_in_sec: int = service.get('timeout_in_sec', 90)
 
-            service_call: List[str] = service['restart_command']
+            service_call: str = service['restart_command']
             out_msg: str = ""
 
             logging.info(f"Trying to restart {display_name} (command: {service_call}) in less than {timeout_in_sec}sec...")
@@ -975,7 +1006,7 @@ class LinuxMonitor:
             out_msg: str = ""
             for service_name in self.config["services"].keys():
                 if is_private or self.config["services"][service_name]['is_private'] == is_private:
-                    res: str = await self.restart_service(is_private=is_private, service_name=service_name)
+                    res: str = await self.restart_service(is_private=is_private, service_name=service_name, force_restart=True)
                     if res != "":
                         if out_msg:
                             out_msg += "\n"
@@ -1012,7 +1043,7 @@ class LinuxMonitor:
                 logging.error(msg=f"Status command (status_command) not found for service {service_name}")
                 return None, ""
 
-            status_command = service['status_command']
+            status_command: str = 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}", 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)
@@ -1022,7 +1053,7 @@ class LinuxMonitor:
             logging.exception(msg=out_msg)
             return None, out_msg
 
-    async def check_all_services_status(self, is_private: bool) -> str:
+    async def check_all_services_status(self, is_private: bool, display_only_if_critical: bool=False) -> str:
         """
         Check the status of all services configured in the JSON configuration file.
 
@@ -1047,58 +1078,85 @@ class LinuxMonitor:
                 "❌"
             )
 
-            out_msg = "# 📱 Services status 📱\n"
-
             for service_name in self.config["services"].keys():
                 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)
                     service_status: str = status_to_string(res=status)
                     service_icon: str = status_to_icon(res=status)
-                    if out_msg != "":
-                        out_msg += "\n"
-                    out_msg += f"- {service_icon} {self.config['services'][service_name]['display_name']}: **{service_status}**"
-                    if status != True and status_msg != "":
-                        out_msg += f"\n{status_msg}"
+
+                    if status is not True or not display_only_if_critical:
+                        if out_msg != "":
+                            out_msg += "\n"
+                        out_msg += f"- {service_icon} {self.config['services'][service_name]['display_name']}: **{service_status}**"
+                        if status != True and status_msg != "":
+                            out_msg += f"\n{status_msg}"
+
+                        if status is False:
+                            out_msg += f"\n - " + await self.restart_service(is_private=is_private, service_name=service_name, force_restart=False)
+
         except Exception as e:
             out_msg = f"**Internal error checking services status**:\n```sh\n{e}\n```"
             logging.exception(msg=out_msg)
 
+
+        if out_msg != "":
+            out_msg = f"# 📱 Services status 📱\n{out_msg}"
+
         return out_msg
 
-    async def check_all_services_status_and_restart_if_down(self, is_private: bool) -> str:
+    async def stop_service(self, is_private: bool, service_name: str) -> str:
         """
-        Check the status of all services configured in the JSON configuration file and restart them if they are inactive.
+        Stop a specific service.
 
-        :param is_private: User permission to check private or public services (True for private, False for public).
+        :param is_private: User permission to stop private or public services (True for private, False for public).
+        :param service_name: The name of the service name to stop (as configured in the JSON configuration file).
 
         :return: A string containing the result message.
         """
-        out_msg_full: str = ""
+        out_msg: 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 = 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}"
+            if service_name not in self.config['services'].keys():
+                out_msg = f"❌ **Service {service_name} not found**."
+                logging.error(msg=out_msg)
+                return out_msg
 
-                        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)."
-                        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```"
-            logging.exception(msg=out_msg_full)
+            service = self.config['services'][service_name]
+            if not is_private and is_private != service['is_private']:
+                out_msg = f"❌ **Service {service_name} not authorized to stop in public**."
+                logging.error(msg=out_msg)
+                return out_msg
+
+            display_name: str = service.get('display_name', service_name)
+            if 'stop_command' not in service:
+                out_msg = f"❌ **Stop command not found for {display_name}**."
+                logging.error(msg=out_msg)
+                return out_msg
+
+            timeout_in_sec: int = service.get('timeout_in_sec', 90)
 
-        if out_msg_full != "":
-            out_msg_full = f"# 📱 Services status 📱\n{out_msg_full}"
+            service_call: str = service['stop_command']
+            out_msg: str = ""
 
-        return out_msg_full
+            logging.info(f"Trying to stop {display_name} (command: {service_call}) in less than {timeout_in_sec}sec...")
+
+            start_time: float = time.time()
+            res, res_msg = await self.execute_and_verify(command=service_call, display_name=f"stop {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} stopped with success** in {readable_duration}sec."
+                logging.info(msg=out_msg)
+            else:
+                out_msg = f"❌ **Error stopping service {display_name}**"
+                if res_msg and res_msg != "":
+                    out_msg += f"\n{res_msg}"
+                logging.warning(msg=out_msg)
+        except Exception as e:
+            out_msg = f"⚠️ **Error stopping service {service_name}**:\n```sh\n{e}\n```"
+            logging.exception(msg=out_msg)
+
+        return out_msg
 
     #endregion
 
@@ -1372,7 +1430,8 @@ class LinuxMonitor:
             command: str = f"last --ip --hostlast --time-format iso --since '{past_date}' | grep 'pts/'"
             last_output: str = subprocess.check_output(
                 args=command,
-                shell=True, text=True
+                shell=True,
+                text=True
             ).strip()
         except subprocess.CalledProcessError as e:
             logging.error(msg=f"Error getting recent user logins:\n{e}")
@@ -1503,13 +1562,12 @@ class LinuxMonitor:
 
         return res, out_msg
 
-    async def check_all_ports(self, is_private: bool, display_only_if_critical: bool=False, restart_if_down: bool=False) -> str:
+    async def check_all_ports(self, is_private: bool, display_only_if_critical: bool=False) -> str:
         """
         Check all ports configured in the JSON configuration file (and restart the service if the port is down and service_name_to_restart added in config file).
 
         :param is_private: User permission to check private or public ports (True for private, False for public).
         :param display_only_if_critical: If True, the string result will only be returned if there is an error during execution.
-        :param restart_if_down: If True, restart the service if the port is down.
 
         :return: A string containing the result message.
         """
@@ -1524,7 +1582,7 @@ class LinuxMonitor:
                     want_port_to_be_open: bool = port_config.get('want_port_to_be_open', True)
 
                     service_name_to_restart: str = ""
-                    if want_port_to_be_open and restart_if_down:
+                    if want_port_to_be_open:
                         service_name_to_restart = port_config.get('service_name_to_restart', "")
 
                     result, result_msg = self._is_port_in_required_state(port=port, host=host, timeout_in_sec=timeout_in_sec, want_port_to_be_open=want_port_to_be_open, display_name=display_name)
@@ -1533,11 +1591,11 @@ class LinuxMonitor:
                             out_msg += "\n"
                         out_msg += f"- {result_msg}"
 
-                    if (not result) and restart_if_down and service_name_to_restart != "":
+                    if (not result) and service_name_to_restart != "":
                         if out_msg != "":
                             out_msg += "\n"
 
-                        restart_res: str = await self.restart_service(is_private=is_private, service_name=service_name_to_restart)
+                        restart_res: str = await self.restart_service(is_private=is_private, service_name=service_name_to_restart, force_restart=False)
                         out_msg += f" - {restart_res}"
 
             if out_msg != "":
@@ -1658,7 +1716,7 @@ class LinuxMonitor:
                 process_cmdline = process_cmdline[:60] + '...'
 
             # Attempt to terminate the process
-            terminate_command: List[str] = ['sudo', '/bin/kill', '-TERM', str(pid)]
+            terminate_command: str = f"sudo /bin/kill -TERM {pid}"
             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:
@@ -1670,7 +1728,7 @@ class LinuxMonitor:
                 out_msg = f"⚠️ **Stopping nicely {pid} ({process_name}) expired**.\n"
 
                 # Attempt to kill the process
-                kill_command = ['sudo', '/bin/kill', '-KILL', str(pid)]
+                kill_command: str = f"sudo /bin/kill -KILL {pid}"
                 _, 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
 
@@ -1793,7 +1851,7 @@ class LinuxMonitor:
             logging.info(msg="Checking services status and all disk usage, CPU, RAM, Swap, CPU temperature and ping of websites periodically...")
             try:
                 # Services status
-                msg: str = await self.check_all_services_status_and_restart_if_down(is_private=is_private)
+                msg: str = await self.check_all_services_status(is_private=is_private, display_only_if_critical=True)
                 if msg != "":
                     logging.warning(msg=msg)
                     if datetime_last_services_error_displayed is None or ((datetime.now() - datetime_last_services_error_displayed).total_seconds() > self.max_duration_seconds_showing_same_error_again_in_scheduled_tasks):
@@ -1919,7 +1977,7 @@ class LinuxMonitor:
                     logging.info(msg="- ✅ All websites availability (GET requests) are OK.")
 
                 # Ports
-                msg = await self.check_all_ports(is_private=is_private, display_only_if_critical=True, restart_if_down=True)
+                msg = await self.check_all_ports(is_private=is_private, display_only_if_critical=True)
                 if msg != "":
                     logging.warning(msg=msg)
                     if datetime_last_port_error_displayed is None or ((datetime.now() - datetime_last_port_error_displayed).total_seconds() > self.max_duration_seconds_showing_same_error_again_in_scheduled_tasks):
@@ -2100,7 +2158,7 @@ class LinuxMonitor:
                 logging.info(msg="-----------------------------------------------")
 
                 # Services status
-                msg: str = await self.check_all_services_status_and_restart_if_down(is_private=is_private)
+                msg: str = await self.check_all_services_status(is_private=is_private, display_only_if_critical=False)
                 if msg != "":
                     if out_msg != "":
                         out_msg += "\n"
@@ -2142,7 +2200,7 @@ class LinuxMonitor:
                     out_msg += msg
 
                 # Ports
-                msg = await self.check_all_ports(is_private=is_private, display_only_if_critical=False, restart_if_down=False)
+                msg = await self.check_all_ports(is_private=is_private, display_only_if_critical=False)
                 if msg != "":
                     if out_msg != "":
                         out_msg += "\n"

{linuxmonitor-1.2.7 → linuxmonitor-1.3.0}/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.7",
+    version="1.3.0",
     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",