Merge "Use MySQL default port when not set explicitly"
This commit is contained in:
@@ -29,6 +29,8 @@ LOG = logging.getLogger(__name__)
|
|||||||
class MySQLLock(locking.Lock):
|
class MySQLLock(locking.Lock):
|
||||||
"""A MySQL based lock."""
|
"""A MySQL based lock."""
|
||||||
|
|
||||||
|
MYSQL_DEFAULT_PORT = 3306
|
||||||
|
|
||||||
def __init__(self, name, parsed_url, options):
|
def __init__(self, name, parsed_url, options):
|
||||||
super(MySQLLock, self).__init__(name)
|
super(MySQLLock, self).__init__(name)
|
||||||
self._conn = MySQLDriver.get_connection(parsed_url, options)
|
self._conn = MySQLDriver.get_connection(parsed_url, options)
|
||||||
@@ -140,7 +142,7 @@ class MySQLDriver(coordination.CoordinationDriver):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_connection(parsed_url, options):
|
def get_connection(parsed_url, options):
|
||||||
host = parsed_url.hostname
|
host = parsed_url.hostname
|
||||||
port = parsed_url.port
|
port = parsed_url.port or MySQLLock.MYSQL_DEFAULT_PORT
|
||||||
dbname = parsed_url.path[1:]
|
dbname = parsed_url.path[1:]
|
||||||
username = parsed_url.username
|
username = parsed_url.username
|
||||||
password = parsed_url.password
|
password = parsed_url.password
|
||||||
|
|||||||
Reference in New Issue
Block a user