From bd3255760b24bf9f3772415afd2e87c7a12a91e6 Mon Sep 17 00:00:00 2001 From: Maxim Bublis Date: Mon, 2 Jul 2018 12:34:32 -0400 Subject: Use MySQL protocol-level ping. Utilizes MySQL protocol-level pings for disconnection detection. This is just a 5-byte packet followed by a 7-byte response. Affects MySQLdb, MySQL Connector and PyMySQL dialects. Change-Id: I672f75e3746878d88987a31750444dde0cf8eb9b Pull-request: https://github.com/zzzeek/sqlalchemy/pull/460 --- lib/sqlalchemy/dialects/mysql/mysqlconnector.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy/dialects/mysql/mysqlconnector.py') diff --git a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py index 1ead8aaf5..e16b68bad 100644 --- a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py +++ b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py @@ -160,6 +160,17 @@ class MySQLDialect_mysqlconnector(MySQLDialect): from mysql import connector return connector + def do_ping(self, dbapi_connection): + try: + dbapi_connection.ping(False) + except self.dbapi.Error as err: + if self.is_disconnect(err, dbapi_connection, None): + return False + else: + raise + else: + return True + def create_connect_args(self, url): opts = url.translate_connect_args(username='user') @@ -225,7 +236,8 @@ class MySQLDialect_mysqlconnector(MySQLDialect): exceptions = (self.dbapi.OperationalError, self.dbapi.InterfaceError) if isinstance(e, exceptions): return e.errno in errnos or \ - "MySQL Connection not available." in str(e) + "MySQL Connection not available." in str(e) or \ + "Connection to MySQL is not available" in str(e) else: return False -- cgit v1.2.1