diff options
| author | martinko | 2014-10-06 13:59:43 +0000 |
|---|---|---|
| committer | martinko | 2014-10-06 13:59:43 +0000 |
| commit | 7079e0b2ac52bb4d9cbc6880f69e218767b27acb (patch) | |
| tree | 03ddf9afbe0029ad6a3187b5c11c2d80da60a29c | |
| parent | 1fae97a57e15bd1a0a24313af11cfd75d438a0fb (diff) | |
| parent | a3f0d9aaa3e76b6ebaa1f778259e4a77dc5f77ca (diff) | |
Merge branch 'master' of https://github.com/markokr/skytools into develop
| -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)) |