Piotr Kliczewski has uploaded a new change for review.
Change subject: stomp: send unsubscribed frame only if there was subscription ......................................................................
stomp: send unsubscribed frame only if there was subscription
Change-Id: I8789b84d131e5551b7383e61e6b71c6da0a512fe Signed-off-by: pkliczewski piotr.kliczewski@gmail.com --- M lib/yajsonrpc/stomp.py 1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/43733/1
diff --git a/lib/yajsonrpc/stomp.py b/lib/yajsonrpc/stomp.py index 7436984..a02a06f 100644 --- a/lib/yajsonrpc/stomp.py +++ b/lib/yajsonrpc/stomp.py @@ -525,8 +525,13 @@ return sub
def unsubscribe(self, sub): - self.queue_frame(Frame(Command.UNSUBSCRIBE, - {"id": sub.id})) + try: + del self._subscriptions[sub.id] + except KeyError: + self.log.warning('No subscription with %s id', sub.id) + else: + self.queue_frame(Frame(Command.UNSUBSCRIBE, + {"id": sub.id}))
class _Subscription(object):
automation@ovirt.org has posted comments on this change.
Change subject: stomp: send unsubscribed frame only if there was subscription ......................................................................
Patch Set 1:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Piotr Kliczewski has posted comments on this change.
Change subject: stomp: send unsubscribed frame only if there was subscription ......................................................................
Patch Set 1: Verified+1
Verified by running local build.
automation@ovirt.org has posted comments on this change.
Change subject: stomp: send unsubscribed frame only if there was subscription ......................................................................
Patch Set 2:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Yaniv Bronhaim has posted comments on this change.
Change subject: stomp: send unsubscribed frame only if there was subscription ......................................................................
Patch Set 2: Code-Review+1
Francesco Romani has posted comments on this change.
Change subject: stomp: send unsubscribed frame only if there was subscription ......................................................................
Patch Set 2: Code-Review+1
automation@ovirt.org has posted comments on this change.
Change subject: stomp: send unsubscribed frame only if there was subscription ......................................................................
Patch Set 3:
* Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])
Dan Kenigsberg has posted comments on this change.
Change subject: stomp: send unsubscribed frame only if there was subscription ......................................................................
Patch Set 3: Code-Review+2
Dan Kenigsberg has submitted this change and it was merged.
Change subject: stomp: send unsubscribed frame only if there was subscription ......................................................................
stomp: send unsubscribed frame only if there was subscription
Change-Id: I8789b84d131e5551b7383e61e6b71c6da0a512fe Signed-off-by: pkliczewski piotr.kliczewski@gmail.com Reviewed-on: https://gerrit.ovirt.org/43733 Reviewed-by: Yaniv Bronhaim ybronhei@redhat.com Reviewed-by: Francesco Romani fromani@redhat.com Continuous-Integration: Jenkins CI Reviewed-by: Dan Kenigsberg danken@redhat.com --- M lib/yajsonrpc/stomp.py 1 file changed, 7 insertions(+), 2 deletions(-)
Approvals: Piotr Kliczewski: Verified Yaniv Bronhaim: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved Francesco Romani: Looks good to me, but someone else must approve
automation@ovirt.org has posted comments on this change.
Change subject: stomp: send unsubscribed frame only if there was subscription ......................................................................
Patch Set 4:
* Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found.
vdsm-patches@lists.fedorahosted.org