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

avahi: Add hostname and port template values to names

Browse Source
This commit is contained in:
Thomas Adamcik 2013-11-11 21:39:14 +01:00
parent fb31193ed0
commit e9c2816354
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mopidy/frontends/http/actor.py
View File

@ -100,7 +100,8 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
host=self.hostname, port=self.port)
if self.zeroconf_service.publish():
logger.info('Registered HTTP with Zeroconf as %s', name)
logger.info('Registered HTTP with Zeroconf as "%s"',
self.zeroconf_service.name)
else:
logger.warning('Registering HTTP with Zeroconf failed.')

2
mopidy/frontends/http/ext.conf
View File

@ -4,7 +4,7 @@ hostname = 127.0.0.1
port = 6680
static_dir =
zeroconf_enabled = true
zeroconf_name = Mopidy
zeroconf_name = Mopidy HTTP server on $hostname
[loglevels]
cherrypy = warning

3
mopidy/frontends/mpd/actor.py
View File

@ -48,7 +48,8 @@ class MpdFrontend(pykka.ThreadingActor, CoreListener):
port=self.port, host=self.hostname)
if self.zeroconf_service.publish():
logger.info('Registered MPD with Zeroconf as %s', name)
logger.info('Registered MPD with Zeroconf as "%s"',
self.zeroconf_service.name)
else:
logger.warning('Registering MPD with Zeroconf failed.')

2
mopidy/frontends/mpd/ext.conf
View File

@ -6,4 +6,4 @@ password =
max_connections = 20
connection_timeout = 60
zeroconf_enabled = true
zeroconf_name = Mopidy (MPD)
zeroconf_name = Mopidy MPD server on $hostname

9
mopidy/utils/zeroconf.py
View File

@ -2,6 +2,8 @@ from __future__ import unicode_literals
import logging
import re
import socket
import string
logger = logging.getLogger('mopidy.utils.zerconf')
@ -31,13 +33,16 @@ class Zeroconf:
def __init__(self, name, port, stype="_http._tcp",
domain="", host="", text=[]):
self.name = name
self.group = None
self.stype = stype
self.domain = domain
self.port = port
self.text = text
self.host = _filter_loopback_and_meta_addresses(host)
self.group = None
template = string.Template(name)
self.name = template.safe_substitute(
hostname=self.host or socket.getfqdn(), port=self.port)
def publish(self):
if not dbus: