From: Barış Metin Date: Fri, 12 Mar 2010 16:06:06 +0000 (+0000) Subject: fix observer for pubsub/configure X-Git-Tag: PLCAPI-5.0-3^2~3 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2780ce3f3e5636f346809f764aaf51a33818c7f2;p=plcapi.git fix observer for pubsub/configure --- diff --git a/omf/omf_slicemgr.py b/omf/omf_slicemgr.py index a2756aa..2f2dc13 100644 --- a/omf/omf_slicemgr.py +++ b/omf/omf_slicemgr.py @@ -108,6 +108,7 @@ class PubSubClient(BaseClient): def __init__(self, id, secret, verbose = False, log = None): BaseClient.__init__(self, id, secret, verbose = verbose, log = log) self.hooks = {} + self.requests = {} def add_result_hook(self, hook_to, hook): self.hooks[hook_to] = hook @@ -118,12 +119,12 @@ class PubSubClient(BaseClient): def event_authenticated(self, xs): BaseClient.event_authenticated(self, xs) - self.requests = {} xs.addObserver("/iq/pubsub/create", self.result_create_node) xs.addObserver("/iq/pubsub/delete", self.result_delete_node) xs.addObserver("/iq/query[@xmlns='http://jabber.org/protocol/disco#items']", self.result_discover) xs.addObserver("/iq/pubsub/subscription[@subscription='subscribed']", self.result_subscribe_to_node) - xs.addObserver("/iq/pubsub/configure", self.result_configure_node) + xs.addObserver("/iq/pubsub/configure/x", self.result_configure_node) + xs.addObserver("/iq/pubsub/configure/error", self.result_configure_node) def __iq(self, t="get"): iq = domish.Element((None, "iq")) @@ -200,6 +201,7 @@ class PubSubClient(BaseClient): if hook: hook(iq) self.delete_result_hook('configure') + self.requests.pop(iq['id'])