sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PresenceService fixes; don't traceback on avahi errors

Browse Source
This commit is contained in:
Dan Williams 2007-04-06 15:29:11 -04:00
parent 9c0e0783db
commit e37bba0094
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
services/presence/PresenceService.py
View File

@ -312,6 +312,8 @@ class PresenceService(object):
self._services = {} # (name, type) -> Service self._services = {} # (name, type) -> Service
self._activities = {} # activity id -> Activity self._activities = {} # activity id -> Activity
self._service_blacklist = {}
# Keep track of stuff we're already browsing # Keep track of stuff we're already browsing
self._service_type_browsers = {} self._service_type_browsers = {}
self._service_browsers = {} self._service_browsers = {}
@ -584,6 +586,11 @@ class PresenceService(object):
retried = True retried = True
logging.error("Retrying resolution of service %s.%s: %s" % (adv.name(), logging.error("Retrying resolution of service %s.%s: %s" % (adv.name(),
adv.stype(), err)) adv.stype(), err))
else:
key = adv.name() + "." + adv.stype()
if not self._service_blacklist.has_key(key):
logging.error("Adding service %s to blacklist" % key)
self._service_blacklist[key] = 1
if not retried: if not retried:
logging.error("Error resolving service %s.%s: %s" % (adv.name(), logging.error("Error resolving service %s.%s: %s" % (adv.name(),
@ -592,10 +599,20 @@ class PresenceService(object):
def _resolve_service(self, adv): def _resolve_service(self, adv):
"""Resolve and lookup a ZeroConf service to obtain its address and TXT records.""" """Resolve and lookup a ZeroConf service to obtain its address and TXT records."""
key = adv.name() + "." + adv.stype()
if self._service_blacklist.has_key(key):
return False
# Ask avahi to resolve this particular service # Ask avahi to resolve this particular service
path = self._mdns_service.ServiceResolverNew(dbus.Int32(adv.interface()), try:
dbus.Int32(adv.protocol()), adv.name(), adv.stype(), adv.domain(), path = self._mdns_service.ServiceResolverNew(dbus.Int32(adv.interface()),
avahi.PROTO_INET, dbus.UInt32(0)) dbus.Int32(adv.protocol()), adv.name(), adv.stype(), adv.domain(),
avahi.PROTO_INET, dbus.UInt32(0))
except dbus.DBusException, e:
if str(e).find("TooManyObjectsError") >= 0:
return False
raise e
resolver = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, path), resolver = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, path),
avahi.DBUS_INTERFACE_SERVICE_RESOLVER) avahi.DBUS_INTERFACE_SERVICE_RESOLVER)
resolver.connect_to_signal('Found', lambda *args: self._service_resolved_cb_glue(adv, *args)) resolver.connect_to_signal('Found', lambda *args: self._service_resolved_cb_glue(adv, *args))