Commit 069dd583 authored by Julien Muchembled's avatar Julien Muchembled

storage: by default, do not retry to connect to MySQL server automatically

parent 7e7af30c
...@@ -106,7 +106,7 @@ class ConfigurationManager(object): ...@@ -106,7 +106,7 @@ class ConfigurationManager(object):
return self.__get('engine', True) return self.__get('engine', True)
def getWait(self): def getWait(self):
# BUG # XXX: see also DatabaseManager.__init__
return self.__get('wait') return self.__get('wait')
def getDynamicMasterList(self): def getDynamicMasterList(self):
......
...@@ -57,7 +57,7 @@ class DatabaseManager(object): ...@@ -57,7 +57,7 @@ class DatabaseManager(object):
_deferred = 0 _deferred = 0
_duplicating = _repairing = None _duplicating = _repairing = None
def __init__(self, database, engine=None, wait=0): def __init__(self, database, engine=None, wait=None):
""" """
Initialize the object. Initialize the object.
""" """
...@@ -66,7 +66,9 @@ class DatabaseManager(object): ...@@ -66,7 +66,9 @@ class DatabaseManager(object):
raise ValueError("Unsupported engine: %r not in %r" raise ValueError("Unsupported engine: %r not in %r"
% (engine, self.ENGINES)) % (engine, self.ENGINES))
self._engine = engine self._engine = engine
self._wait = wait # XXX: Maybe the default should be to retry indefinitely.
# But for unit tests, we really want to never retry.
self._wait = wait or 0
self._parse(database) self._parse(database)
self._connect() self._connect()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment