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.conf import Configurable
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 ConfigFlags
from core.enumerations import EventTypes
@ -525,7 +525,8 @@ class CoreServices(ConfigurableManager):
return None
if len(servicesstring) == 3:
# 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
svc = services[0]
@ -654,7 +655,6 @@ class CoreServices(ConfigurableManager):
r += "-%d" % i
return r
# TODO: need to remove depenency on old message structure below
def getservicefile(self, services, node, filename):
"""
Send a File Message when the GUI has requested a service file.
@ -683,14 +683,13 @@ class CoreServices(ConfigurableManager):
data = "%s" % data
filetypestr = "service:%s" % svc._name
# send a file message
flags = MessageFlags.ADD.value
tlvdata = coreapi.CoreFileTlv.pack(FileTlvs.NODE.value, node.objid)
tlvdata += coreapi.CoreFileTlv.pack(FileTlvs.NAME.value, filename)
tlvdata += coreapi.CoreFileTlv.pack(FileTlvs.TYPE.value, filetypestr)
tlvdata += coreapi.CoreFileTlv.pack(FileTlvs.FILE_DATA.value, data)
reply = coreapi.CoreFileMessage.pack(flags, tlvdata)
return reply
return FileData(
message_type=MessageFlags.ADD.value,
node=node.objid,
name=filename,
type=filetypestr,
data=data
)
def getservicefiledata(self, service, filename):
"""