diff options
author | Marko Kreen | 2014-08-07 13:03:41 +0000 |
---|---|---|
committer | Marko Kreen | 2014-08-07 13:03:56 +0000 |
commit | 2346eaad4603e588f8a05bea1bc282eeed765884 (patch) | |
tree | 43e1ea6c79d08d38d29b0f459783fa755b01c0eb | |
parent | 0072a32cdcf49aef83cf56285d320dfe554fd0d5 (diff) |
cascadeadmin: allow drop-node of root
-rw-r--r-- | python/pgq/cascade/admin.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/python/pgq/cascade/admin.py b/python/pgq/cascade/admin.py index 39ffd96c..623c72e7 100644 --- a/python/pgq/cascade/admin.py +++ b/python/pgq/cascade/admin.py @@ -656,9 +656,12 @@ class CascadeAdmin(skytools.AdminScript): try: # unregister node location from root node (event will be added to queue) - root_db = self.find_root_db() - q = "select * from pgq_node.unregister_location(%s, %s)" - self.exec_cmd(root_db, q, [self.queue_name, node_name]) + if node and node.type == 'root': + pass + else: + root_db = self.find_root_db() + q = "select * from pgq_node.unregister_location(%s, %s)" + self.exec_cmd(root_db, q, [self.queue_name, node_name]) except skytools.DBError, d: self.log.warning("Unregister from root failed: %s", str(d)) |