afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed issue with core config messages generating file messages, still seems to be an inifinite loop issue

Browse source
This commit is contained in:
Blake J. Harnden 2017-07-11 15:51:56 -07:00
parent 336702a056
commit 9934ce8d3f
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
daemon/core/service.py
View file

@ -16,7 +16,7 @@ from itertools import repeat
from core.api import coreapi from core.api import coreapi
from core.conf import Configurable from core.conf import Configurable
from core.conf import ConfigurableManager from core.conf import ConfigurableManager
from core.data import EventData, ConfigData from core.data import EventData, ConfigData, FileData
from core.enumerations import ConfigDataTypes from core.enumerations import ConfigDataTypes
from core.enumerations import ConfigFlags from core.enumerations import ConfigFlags
from core.enumerations import EventTypes from core.enumerations import EventTypes
@ -525,7 +525,8 @@ class CoreServices(ConfigurableManager):
return None return None
if len(servicesstring) == 3: if len(servicesstring) == 3:
# a file request: e.g. "service:zebra:quagga.conf" # a file request: e.g. "service:zebra:quagga.conf"
return self.getservicefile(services, n, servicesstring[2]) file_data = self.getservicefile(services, n, servicesstring[2])
self.session.broadcast_file(file_data)
# the first service in the list is the one being configured # the first service in the list is the one being configured
svc = services[0] svc = services[0]
@ -654,7 +655,6 @@ class CoreServices(ConfigurableManager):
r += "-%d" % i r += "-%d" % i
return r return r
# TODO: need to remove depenency on old message structure below
def getservicefile(self, services, node, filename): def getservicefile(self, services, node, filename):
""" """
Send a File Message when the GUI has requested a service file. Send a File Message when the GUI has requested a service file.
@ -683,14 +683,13 @@ class CoreServices(ConfigurableManager):
data = "%s" % data data = "%s" % data
filetypestr = "service:%s" % svc._name filetypestr = "service:%s" % svc._name
# send a file message return FileData(
flags = MessageFlags.ADD.value message_type=MessageFlags.ADD.value,
tlvdata = coreapi.CoreFileTlv.pack(FileTlvs.NODE.value, node.objid) node=node.objid,
tlvdata += coreapi.CoreFileTlv.pack(FileTlvs.NAME.value, filename) name=filename,
tlvdata += coreapi.CoreFileTlv.pack(FileTlvs.TYPE.value, filetypestr) type=filetypestr,
tlvdata += coreapi.CoreFileTlv.pack(FileTlvs.FILE_DATA.value, data) data=data
reply = coreapi.CoreFileMessage.pack(flags, tlvdata) )
return reply
def getservicefiledata(self, service, filename): def getservicefiledata(self, service, filename):
""" """