summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2013-03-20 17:37:06 +0000
committerMarko Kreen2013-03-20 17:37:06 +0000
commit15177e960726400f759228ed064384cf73b217dd (patch)
tree66f39006a79086956811e0459bcda21cb8c1f14b
parent770a843296c06e66da8103cae3eef1209c11e278 (diff)
cascadeadmin: avoid hardwired db name
-rw-r--r--python/pgq/cascade/admin.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/python/pgq/cascade/admin.py b/python/pgq/cascade/admin.py
index 4fbd2f48..d0b0ceaa 100644
--- a/python/pgq/cascade/admin.py
+++ b/python/pgq/cascade/admin.py
@@ -140,7 +140,7 @@ class CascadeAdmin(skytools.AdminScript):
#
def cmd_install(self):
- db = self.get_database("db")
+ db = self.get_database(self.initial_db_name)
self.install_code(db)
def cmd_create_root(self, *args):
@@ -192,7 +192,7 @@ class CascadeAdmin(skytools.AdminScript):
raise UsageError('No host= in public connect string, bad idea')
# connect to database
- db = self.get_database("db")
+ db = self.get_database(self.initial_db_name)
# check if code is installed
self.install_code(db)
@@ -962,7 +962,7 @@ class CascadeAdmin(skytools.AdminScript):
root_node = self.find_root_node()
self.log.info("Root is %s", root_node)
- dst_db = self.get_database('db')
+ dst_db = self.get_database(self.initial_db_name)
self.wait_for_node(dst_db, root_node)
def cmd_wait_provider(self):
@@ -974,7 +974,7 @@ class CascadeAdmin(skytools.AdminScript):
self.log.info("Current node is root, no need to wait")
return
- dst_db = self.get_database('db')
+ dst_db = self.get_database(self.initial_db_name)
node = self.queue_info.local_node.provider_node
self.log.info("Provider is %s", node)
self.wait_for_node(dst_db, node)