Properly use mariadb-admin instead of mysqladmin

This commit is contained in:
VirtuBox
2024-06-07 16:51:53 +02:00
parent 486ce838f7
commit c35e9e6fa3
7 changed files with 30 additions and 18 deletions

View File

@@ -7,6 +7,7 @@ from pymysql import DatabaseError, Error, connections
from wo.core.logging import Log
from wo.core.variables import WOVar
from wo.core.shellexec import WOShellExec
class MySQLConnectionError(Exception):
@@ -161,3 +162,17 @@ class WOMysql():
except MySQLConnectionError as e:
Log.debug(self, str(e))
return False
def mariadb_ping(self):
if os.path.exists('/usr/bin/mariadb-admin'):
mariadb_admin = "/usr/bin/mariadb-admin"
elif os.path.exists('/usr/bin/mysqladmin'):
mariadb_admin = "/usr/bin/mysqladmin"
else:
Log.info(self, "MariaDB server isn't installed")
return False
if WOShellExec.cmd_exec(self, f"{mariadb_admin} ping"):
return True
else:
Log.info(self, "Unable to connect to MariaDB server")
return False