From 6ad235564e51f16080246d7d6028daffbc5d6ec7 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 15 Sep 2015 11:25:17 +0200 Subject: [PATCH] zeroconf: Display Avahi server's hostname --- mopidy/zeroconf.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mopidy/zeroconf.py b/mopidy/zeroconf.py index 64a9b111..4ca49b69 100644 --- a/mopidy/zeroconf.py +++ b/mopidy/zeroconf.py @@ -1,7 +1,6 @@ from __future__ import absolute_import, unicode_literals import logging -import socket import string logger = logging.getLogger(__name__) @@ -64,13 +63,13 @@ class Zeroconf(object): except dbus.exceptions.DBusException as e: logger.debug('%s: Server failed: %s', self, e) - self.display_hostname = '%s.local' % socket.getfqdn() + self.display_hostname = '%s' % self.server.GetHostName() self.name = string.Template(name).safe_substitute( hostname=self.display_hostname, port=port) def __str__(self): - return 'Zeroconf service %s at [%s]:%d' % ( - self.stype, self.host, self.port) + return 'Zeroconf service "%s" (%s at [%s]:%d)' % ( + self.name, self.stype, self.host, self.port) def publish(self): """Publish the service.