From c098ac961f21d12f1908a4e791ea711bcd2a1ea0 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Thu, 17 Jul 2014 00:19:06 +0200
Subject: [PATCH] zeroconf: Improve log messages

---
 mopidy/zeroconf.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/mopidy/zeroconf.py b/mopidy/zeroconf.py
index 1111975f..fff6ff27 100644
--- a/mopidy/zeroconf.py
+++ b/mopidy/zeroconf.py
@@ -56,6 +56,10 @@ class Zeroconf(object):
         self.name = template.safe_substitute(
             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):
         """Publish the service.
 
@@ -64,11 +68,11 @@ class Zeroconf(object):
 
         if _is_loopback_address(self.host):
             logger.debug(
-                'Zeroconf publish on loopback interface is not supported.')
+                '%s: Publish on loopback interface is not supported.', self)
             return False
 
         if not dbus:
-            logger.debug('Zeroconf publish failed: dbus not installed.')
+            logger.debug('%s: dbus not installed; publish failed.', self)
             return False
 
         try:
@@ -76,7 +80,7 @@ class Zeroconf(object):
 
             if not bus.name_has_owner('org.freedesktop.Avahi'):
                 logger.debug(
-                    'Zeroconf publish failed: Avahi service not running.')
+                    '%s: Avahi service not running; publish failed.', self)
                 return False
 
             server = dbus.Interface(
@@ -95,9 +99,10 @@ class Zeroconf(object):
                 self.domain, self.host, dbus.UInt16(self.port), text)
 
             self.group.Commit()
+            logger.debug('%s: Published', self)
             return True
         except dbus.exceptions.DBusException as e:
-            logger.debug('Zeroconf publish failed: %s', e)
+            logger.debug('%s: Publish failed: %s', self, e)
             return False
 
     def unpublish(self):
@@ -109,7 +114,8 @@ class Zeroconf(object):
         if self.group:
             try:
                 self.group.Reset()
+                logger.debug('%s: Unpublished', self)
             except dbus.exceptions.DBusException as e:
-                logger.debug('Zeroconf unpublish failed: %s', e)
+                logger.debug('%s: Unpublish failed: %s', self, e)
             finally:
                 self.group = None