andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zeroconf: Improve log messages

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-07-17 00:19:06 +02:00
parent 971d320f1f
commit c098ac961f
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mopidy/zeroconf.py
View File

@ -56,6 +56,10 @@ class Zeroconf(object):
self.name = template.safe_substitute( self.name = template.safe_substitute(
hostname=self.host or socket.getfqdn(), port=self.port) hostname=self.host or socket.getfqdn(), port=self.port)
def __str__(self):
return 'Zeroconf service %s at [%s]:%d' % (
self.stype, self.host, self.port)
def publish(self): def publish(self):
"""Publish the service. """Publish the service.
@ -64,11 +68,11 @@ class Zeroconf(object):
if _is_loopback_address(self.host): if _is_loopback_address(self.host):
logger.debug( logger.debug(
'Zeroconf publish on loopback interface is not supported.') '%s: Publish on loopback interface is not supported.', self)
return False return False
if not dbus: if not dbus:
logger.debug('Zeroconf publish failed: dbus not installed.') logger.debug('%s: dbus not installed; publish failed.', self)
return False return False
try: try:
@ -76,7 +80,7 @@ class Zeroconf(object):
if not bus.name_has_owner('org.freedesktop.Avahi'): if not bus.name_has_owner('org.freedesktop.Avahi'):
logger.debug( logger.debug(
'Zeroconf publish failed: Avahi service not running.') '%s: Avahi service not running; publish failed.', self)
return False return False
server = dbus.Interface( server = dbus.Interface(
@ -95,9 +99,10 @@ class Zeroconf(object):
self.domain, self.host, dbus.UInt16(self.port), text) self.domain, self.host, dbus.UInt16(self.port), text)
self.group.Commit() self.group.Commit()
logger.debug('%s: Published', self)
return True return True
except dbus.exceptions.DBusException as e: except dbus.exceptions.DBusException as e:
logger.debug('Zeroconf publish failed: %s', e) logger.debug('%s: Publish failed: %s', self, e)
return False return False
def unpublish(self): def unpublish(self):
@ -109,7 +114,8 @@ class Zeroconf(object):
if self.group: if self.group:
try: try:
self.group.Reset() self.group.Reset()
logger.debug('%s: Unpublished', self)
except dbus.exceptions.DBusException as e: except dbus.exceptions.DBusException as e:
logger.debug('Zeroconf unpublish failed: %s', e) logger.debug('%s: Unpublish failed: %s', self, e)
finally: finally:
self.group = None self.group = None