summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/londiste/playback.py2
-rw-r--r--python/londiste/setup.py2
-rw-r--r--python/skytools/scripting.py4
3 files changed, 4 insertions, 4 deletions
diff --git a/python/londiste/playback.py b/python/londiste/playback.py
index 5eed8ae3..e7bc1406 100644
--- a/python/londiste/playback.py
+++ b/python/londiste/playback.py
@@ -273,7 +273,7 @@ class Replicator(CascadedWorker):
if self.parallel_copies < 1:
raise Exception('Bad value for parallel_copies: %d' % self.parallel_copies)
- def connection_setup(self, dbname, db):
+ def connection_hook(self, dbname, db):
if dbname == 'db':
curs = db.cursor()
curs.execute("set session_replication_role = 'replica'")
diff --git a/python/londiste/setup.py b/python/londiste/setup.py
index d32a0a0d..0dbc0457 100644
--- a/python/londiste/setup.py
+++ b/python/londiste/setup.py
@@ -27,7 +27,7 @@ class LondisteSetup(CascadeAdmin):
self.set_name = self.queue_name
- def connection_setup(self, dbname, db):
+ def connection_hook(self, dbname, db):
if dbname == 'db':
curs = db.cursor()
curs.execute("set session_replication_role = 'replica'")
diff --git a/python/skytools/scripting.py b/python/skytools/scripting.py
index 02f00c79..83e050eb 100644
--- a/python/skytools/scripting.py
+++ b/python/skytools/scripting.py
@@ -532,7 +532,7 @@ class DBScript(object):
self.log.info(logmsg)
self.stat_dict = {}
- def connection_setup(self, dbname, conn):
+ def connection_hook(self, dbname, conn):
pass
def get_database(self, dbname, autocommit = 0, isolation_level = -1,
@@ -551,7 +551,7 @@ class DBScript(object):
else:
if not connstr:
connstr = self.cf.get(dbname)
- dbc = DBCachedConn(cache, connstr, max_age, setup_func = self.connection_setup)
+ dbc = DBCachedConn(cache, connstr, max_age, setup_func = self.connection_hook)
self.db_cache[cache] = dbc
return dbc.get_connection(autocommit, isolation_level)