comparison src/plugins/plugin_misc_groupblog.py @ 478:f856575a62a6

plugin groupblog: fixed initialisation
author Goffi <goffi@goffi.org>
date Mon, 25 Jun 2012 01:00:55 +0200
parents 031b0e0aaab8
children 2a072735e459
comparison
equal deleted inserted replaced
477:031b0e0aaab8 478:f856575a62a6
123 #we first check that we have a item-access pubsub server 123 #we first check that we have a item-access pubsub server
124 if not hasattr(client,"item_access_pubsub"): 124 if not hasattr(client,"item_access_pubsub"):
125 debug(_('Looking for item-access power pubsub server')) 125 debug(_('Looking for item-access power pubsub server'))
126 #we don't have any pubsub server featuring item access yet 126 #we don't have any pubsub server featuring item access yet
127 client.item_access_pubsub = None 127 client.item_access_pubsub = None
128 client._item_access_pubsub_pending = defer.Deferred()
128 for entity in self.host.memory.getServerServiceEntities("pubsub", "service", profile): 129 for entity in self.host.memory.getServerServiceEntities("pubsub", "service", profile):
129 _disco = yield client.disco.requestInfo(entity) 130 _disco = yield client.disco.requestInfo(entity)
130 #if set([NS_PUBSUB_ITEM_ACCESS, NS_PUBSUB_AUTO_CREATE, NS_PUBSUB_CREATOR_JID_CHECK]).issubset(_disco.features): 131 #if set([NS_PUBSUB_ITEM_ACCESS, NS_PUBSUB_AUTO_CREATE, NS_PUBSUB_CREATOR_JID_CHECK]).issubset(_disco.features):
131 if set([NS_PUBSUB_AUTO_CREATE, NS_PUBSUB_CREATOR_JID_CHECK]).issubset(_disco.features): 132 if set([NS_PUBSUB_AUTO_CREATE, NS_PUBSUB_CREATOR_JID_CHECK]).issubset(_disco.features):
132 info(_("item-access powered pubsub service found: [%s]") % entity.full()) 133 info(_("item-access powered pubsub service found: [%s]") % entity.full())
133 client.item_access_pubsub = entity 134 client.item_access_pubsub = entity
135 client._item_access_pubsub_pending.callback(None)
136
137 if hasattr(client,"_item_access_pubsub_pending"):
138 #XXX: we need to wait for item access pubsub service check
139 ignore = yield client._item_access_pubsub_pending
140 del client._item_access_pubsub_pending
134 141
135 if not client.item_access_pubsub: 142 if not client.item_access_pubsub:
136 error(_("No item-access powered pubsub server found, can't use group blog")) 143 error(_("No item-access powered pubsub server found, can't use group blog"))
137 raise NoCompatiblePubSubServerFound 144 raise NoCompatiblePubSubServerFound
138 145