anonfunc/LedD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some small improvements and fixes for zeroconf

Browse Source
This commit is contained in:
Giovanni Harting
2015-08-28 19:48:26 +02:00
parent 43c956c61d
commit 31f9ad5541
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ledd/daemon.py
View File

@@ -26,7 +26,7 @@ import asyncio
import spectra import spectra
from zeroconf import Zeroconf from zeroconf import Zeroconf, ServiceInfo
from ledd import controller, VERSION from ledd import controller, VERSION
from ledd.decorators import ledd_protocol from ledd.decorators import ledd_protocol
@@ -59,8 +59,8 @@ class Daemon:
log.info("No config file found!") log.info("No config file found!")
# create zeroconf service info # create zeroconf service info
# self.zinfo = ServiceInfo("_ledd._tcp", "LedD Daemon", self.zinfo = ServiceInfo("_ledd._tcp.local.", "LedD Daemon._ledd._tcp.local.",
# port=self.config.get(self.daemonSection, 'port', fallback=1425)) port=self.config.get(self.daemonSection, 'port', fallback=1425))
# SQL init # SQL init
self.sqldb = sqlite3.connect(self.config.get(self.databaseSection, 'name', fallback='ledd.sqlite')) self.sqldb = sqlite3.connect(self.config.get(self.databaseSection, 'name', fallback='ledd.sqlite'))
@@ -77,7 +77,7 @@ class Daemon:
logging.getLogger("asyncio").setLevel(logging.DEBUG) logging.getLogger("asyncio").setLevel(logging.DEBUG)
# announce server to network # announce server to network
#self.register_zeroconf() self.register_zeroconf()
# main loop # main loop
self.loop = asyncio.get_event_loop() self.loop = asyncio.get_event_loop()
@@ -129,13 +129,22 @@ class Daemon:
self.check_db() self.check_db()
def register_zeroconf(self): def register_zeroconf(self):
zeroconf = Zeroconf() try:
zeroconf.register_service(self.zinfo) zeroconf = Zeroconf()
log.info("Registered ledd daemon with zeroconf") zeroconf.register_service(self.zinfo)
log.info("Registered ledd daemon with zeroconf")
except OSError as e:
log.warning("Failed to register service with ZeroConf: %s", e)
pass
def deregister_zeroconf(self): def deregister_zeroconf(self):
zeroconf = Zeroconf() try:
zeroconf.unregister_service(self.zinfo) zeroconf = Zeroconf()
zeroconf.unregister_service(self.zinfo)
log.info("Unregistered ledd daemon with zeroconf")
except OSError as e:
log.warning("Failed to deregister service with ZeroConf: %s", e)
pass
@ledd_protocol(protocol) @ledd_protocol(protocol)
def start_effect(self, req_json): def start_effect(self, req_json):