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

zeroconf: Move bus and server setup to init

Browse Source
This commit is contained in:
Stein Magnus Jodal 2015-09-15 11:14:32 +02:00
parent a4f38e2018
commit 684ea80f58
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mopidy/zeroconf.py
View File

@ -54,6 +54,17 @@ class Zeroconf(object):
self.port = port self.port = port
self.text = text or [] self.text = text or []
self.bus = None
self.server = None
self.group = None
try:
self.bus = dbus.SystemBus()
self.server = dbus.Interface(
self.bus.get_object('org.freedesktop.Avahi', '/'),
'org.freedesktop.Avahi.Server')
except dbus.exceptions.DBusException as e:
logger.debug('%s: Server failed: %s', self, e)
template = string.Template(name) template = string.Template(name)
self.name = template.safe_substitute( self.name = template.safe_substitute(
hostname=socket.getfqdn(), port=self.port) hostname=socket.getfqdn(), port=self.port)
@ -78,21 +89,23 @@ class Zeroconf(object):
logger.debug('%s: dbus not installed; publish failed.', self) logger.debug('%s: dbus not installed; publish failed.', self)
return False return False
try: if not self.bus:
bus = dbus.SystemBus() logger.debug('%s: Bus not available; publish failed.', self)
return False
if not bus.name_has_owner('org.freedesktop.Avahi'): if not self.server:
logger.debug('%s: Server not available; publish failed.', self)
return False
try:
if not self.bus.name_has_owner('org.freedesktop.Avahi'):
logger.debug( logger.debug(
'%s: Avahi service not running; publish failed.', self) '%s: Avahi service not running; publish failed.', self)
return False return False
server = dbus.Interface(
bus.get_object('org.freedesktop.Avahi', '/'),
'org.freedesktop.Avahi.Server')
self.group = dbus.Interface( self.group = dbus.Interface(
bus.get_object( self.bus.get_object(
'org.freedesktop.Avahi', server.EntryGroupNew()), 'org.freedesktop.Avahi', self.server.EntryGroupNew()),
'org.freedesktop.Avahi.EntryGroup') 'org.freedesktop.Avahi.EntryGroup')
self.group.AddService( self.group.AddService(