From 34e327ed127440241f60fb48a1b7870961950440 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 16 Nov 2013 01:28:44 +0100 Subject: [PATCH] zeroconf: Wrap publish in try-except --- mopidy/utils/zeroconf.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/mopidy/utils/zeroconf.py b/mopidy/utils/zeroconf.py index 6b43e62e..36d38f8b 100644 --- a/mopidy/utils/zeroconf.py +++ b/mopidy/utils/zeroconf.py @@ -46,34 +46,33 @@ class Zeroconf(object): try: bus = dbus.SystemBus() - except dbus.exceptions.DBusException as e: - logger.debug('Zeroconf publish failed: %s', e) - return False - if not bus.name_has_owner('org.freedesktop.Avahi'): - logger.debug('Zeroconf publish failed: Avahi service not running.') - return False + if not bus.name_has_owner('org.freedesktop.Avahi'): + logger.debug( + 'Zeroconf publish failed: Avahi service not running.') + return False - server = dbus.Interface(bus.get_object('org.freedesktop.Avahi', '/'), - 'org.freedesktop.Avahi.Server') + server = dbus.Interface( + bus.get_object('org.freedesktop.Avahi', '/'), + 'org.freedesktop.Avahi.Server') - self.group = dbus.Interface( - bus.get_object('org.freedesktop.Avahi', server.EntryGroupNew()), - 'org.freedesktop.Avahi.EntryGroup') + self.group = dbus.Interface( + bus.get_object( + 'org.freedesktop.Avahi', server.EntryGroupNew()), + 'org.freedesktop.Avahi.EntryGroup') - try: text = [_convert_text_to_dbus_bytes(t) for t in self.text] self.group.AddService( _AVAHI_IF_UNSPEC, _AVAHI_PROTO_UNSPEC, dbus.UInt32(_AVAHI_PUBLISHFLAGS_NONE), self.name, self.stype, self.domain, self.host, dbus.UInt16(self.port), text) + + self.group.Commit() + return True except dbus.exceptions.DBusException as e: logger.debug('Zeroconf publish failed: %s', e) return False - self.group.Commit() - return True - def unpublish(self): if self.group: self.group.Reset()