diff -r 31e63e25b4cc -r 64beb9e9c749 runtime/ServicePublisher.py --- a/runtime/ServicePublisher.py Mon Aug 21 20:17:19 2017 +0000 +++ b/runtime/ServicePublisher.py Mon Aug 21 23:22:58 2017 +0300 @@ -21,33 +21,35 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import socket, threading +import socket +import threading from util import Zeroconf service_type = '_PYRO._tcp.local.' + class ServicePublisher(): def __init__(self): # type: fully qualified service type name - self.serviceproperties = {'description':'Beremiz remote PLC'} - + self.serviceproperties = {'description': 'Beremiz remote PLC'} + self.name = None self.ip_32b = None self.port = None self.server = None self.service_name = None self.retrytimer = None - + def RegisterService(self, name, ip, port): try: self._RegisterService(name, ip, port) - except Exception,e: - self.retrytimer = threading.Timer(2,self.RegisterService,[name, ip, port]) - self.retrytimer.start() + except Exception, e: + self.retrytimer = threading.Timer(2, self.RegisterService, [name, ip, port]) + self.retrytimer.start() def _RegisterService(self, name, ip, port): # name: fully qualified service name - self.service_name = 'Beremiz_%s.%s'%(name,service_type) + self.service_name = 'Beremiz_%s.%s' % (name, service_type) self.name = name self.port = port @@ -64,23 +66,23 @@ self.service_name, self.ip_32b, self.port, - properties = self.serviceproperties)) - self.retrytimer=None - + properties=self.serviceproperties)) + self.retrytimer = None + def UnRegisterService(self): if self.retrytimer is not None: self.retrytimer.cancel() self.server.unregisterService( - Zeroconf.ServiceInfo(service_type, - self.service_name, - self.ip_32b, - self.port, - properties = self.serviceproperties)) + Zeroconf.ServiceInfo(service_type, + self.service_name, + self.ip_32b, + self.port, + properties=self.serviceproperties)) self.server.close() self.server = None - - def gethostaddr(self, dst = '224.0.1.41'): + + def gethostaddr(self, dst='224.0.1.41'): s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) try: s.connect((dst, 7)) @@ -88,6 +90,6 @@ s.close() if host != '0.0.0.0': return host - except Exception,e: + except Exception, e: pass return socket.gethostbyname(socket.gethostname())