v4.3.2

dolphie/DataTypes.py

@@ -95,6 +95,7 @@ def __init__(self, thread_data: Dict[str, str]):
         self.db = thread_data.get("db", "")
         self.query = thread_data.get("query", "")
         self.time = int(thread_data.get("time", 0))
+        self.protocol = self._get_formatted_string(thread_data.get("connection_type", ""))
         self.formatted_query = self._get_formatted_query(thread_data.get("query", ""))
         self.formatted_time = self._get_formatted_time()
         self.command = self._get_formatted_command(thread_data.get("command", ""))

dolphie/Modules/ArgumentParser.py

@@ -385,7 +385,7 @@ def _parse(self):
 
                     if not hosts:
                         self.exit(
-                            f"Hostgroup [red2]{hostgroup}[/red2] cannot be loaded because"
+                            f"{config_file}: Hostgroup [red2]{hostgroup}[/red2] cannot be loaded because"
                             f" it doesn't have any hosts listed under its section in Dolphie's config"
                         )
 

dolphie/Modules/MySQL.py

@@ -31,9 +31,9 @@ def __init__(
         self.ssl = ssl
         self.save_connection_id = save_connection_id
 
-        self.max_reconnect_attempts = 3
-        self.running_query = False
-        self.using_ssl = False
+        self.max_reconnect_attempts: int = 3
+        self.running_query: bool = False
+        self.using_ssl: str = None
 
         if auto_connect:
             self.connect()
@@ -58,7 +58,7 @@ def connect(self):
             if self.save_connection_id:
                 self.connection_id = self.fetch_value_from_field("SELECT CONNECTION_ID()")
 
-            # Check if SSL is being used
+            # Determine if SSL is being used
             self.using_ssl = "ON" if self.fetch_value_from_field("SHOW STATUS LIKE 'Ssl_cipher'", "Value") else "OFF"
 
         except pymysql.Error as e:

dolphie/Modules/Queries.py

@@ -19,7 +19,8 @@ class MySQLQueries:
             IFNULL(trx_rows_locked, "0")        AS trx_rows_locked,
             IFNULL(trx_rows_modified, "0")      AS trx_rows_modified,
             IFNULL(trx_concurrency_tickets, "") AS trx_concurrency_tickets,
-            IFNULL(TIMESTAMPDIFF(SECOND, trx_started, NOW()), "") AS trx_time
+            IFNULL(TIMESTAMPDIFF(SECOND, trx_started, NOW()), "") AS trx_time,
+            "" AS connection_type
         FROM
             information_schema.PROCESSLIST pl
             LEFT JOIN information_schema.innodb_trx ON trx_mysql_thread_id = pl.Id
@@ -44,7 +45,8 @@ class MySQLQueries:
             IFNULL(trx_rows_locked, "0")        AS trx_rows_locked,
             IFNULL(trx_rows_modified, "0")      AS trx_rows_modified,
             IFNULL(trx_concurrency_tickets, "") AS trx_concurrency_tickets,
-            IFNULL(TIMESTAMPDIFF(SECOND, trx_started, NOW()), "") AS trx_time
+            IFNULL(TIMESTAMPDIFF(SECOND, trx_started, NOW()), "") AS trx_time,
+            IFNULL(connection_type, "")         AS connection_type
         FROM
             performance_schema.threads t
             LEFT JOIN information_schema.innodb_trx tx ON trx_mysql_thread_id = t.processlist_id

dolphie/Modules/TabManager.py

@@ -1,5 +1,6 @@
 import asyncio
 from dataclasses import dataclass
+from typing import List
 
 import dolphie.Modules.MetricManager as MetricManager
 from dolphie import Dolphie
@@ -457,7 +458,7 @@ def get_tab(self, id: int) -> Tab:
         if id in self.tabs:
             return self.tabs[id]
 
-    def get_all_tabs(self) -> list[Tab]:
+    def get_all_tabs(self) -> List[Tab]:
         all_tabs = []
 
         for tab in self.tabs.values():

dolphie/Panels/processlist_panel.py

@@ -17,6 +17,7 @@ def create_panel(tab: Tab) -> DataTable:
 
     columns = [
         {"name": "Process ID", "field": "id", "width": 11, "format_number": False},
+        {"name": "Protocol", "field": "protocol", "width": 8, "format_number": False},
         {"name": "Username", "field": "user", "width": 20, "format_number": False},
     ]
 

dolphie/app.py

@@ -1302,6 +1302,10 @@ def execute_kill(thread_id):
 
                 thread_id = additional_data
                 thread_data: ProcesslistThread = dolphie.processlist_threads_snapshot.get(thread_id)
+                if not thread_data:
+                    self.notify(f"Thread ID [highlight]{thread_id}[/highlight] was not found", severity="error")
+                    return
+
                 thread_table.add_row("[label]Thread ID", thread_id)
                 thread_table.add_row("[label]User", thread_data.user)
                 thread_table.add_row("[label]Host", thread_data.host)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dolphie"
-version = "4.3.1"
+version = "4.3.2"
 license = "GPL-3.0-or-later"
 description = "Echolocate your MySQL health with real-time monitoring in the terminal"
 authors = ["Charles Thompson <[email protected]>"]