From 37cc116663a78871cde62e7efeaf4043af7d1429 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Tue, 15 Nov 2011 16:12:14 +0200 Subject: [PATCH] change-provider: catch error when unregistering --- python/pgq/cascade/admin.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/python/pgq/cascade/admin.py b/python/pgq/cascade/admin.py index 4213a51c..144eee5f 100644 --- a/python/pgq/cascade/admin.py +++ b/python/pgq/cascade/admin.py @@ -422,12 +422,15 @@ class CascadeAdmin(skytools.AdminScript): self.resume_consumer(node, consumer) # unsubscribe from old provider - if is_worker: - q = "select * from pgq_node.unregister_subscriber(%s, %s)" - self.node_cmd(old_provider, q, [self.queue_name, node]) - else: - q = "select * from pgq.unregister_consumer(%s, %s)" - self.node_cmd(old_provider, q, [self.queue_name, consumer]) + try: + if is_worker: + q = "select * from pgq_node.unregister_subscriber(%s, %s)" + self.node_cmd(old_provider, q, [self.queue_name, node]) + else: + q = "select * from pgq.unregister_consumer(%s, %s)" + self.node_cmd(old_provider, q, [self.queue_name, consumer]) + except skytools.DBError, d: + self.log.warning("failed to unregister from old provider (%s): %s", old_provider, str(d)) def cmd_rename_node(self, old_name, new_name): """Rename node.""" -- 2.39.5