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

allow executing XML files from daemon from Register Message

Browse source 
(like a Python script)
added start flag to xmlutils.opensessionxml(), 
XML file will be parsed into a live running session
(Boeing r1792)
This commit is contained in:
ahrenholz 2013-11-25 19:54:02 +00:00
parent 93f96c7707
commit 1e8abc4c1e
3 changed files with 44 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

12
daemon/sbin/core-daemon
View file

@ -861,11 +861,9 @@ class CoreRequestHandler(SocketServer.BaseRequestHandler):
''' Register Message Handler
'''
replies = []
# execute a Python script
# execute a Python script or XML file
ex = msg.gettlv(coreapi.CORE_TLV_REG_EXECSRV)
if ex:
# TODO: load and execute XML files here
try:
self.info("executing '%s'" % ex)
if isinstance(self.server, CoreUdpServer):
@ -875,12 +873,16 @@ class CoreRequestHandler(SocketServer.BaseRequestHandler):
if msg.flags & coreapi.CORE_API_STR_FLAG:
old_session_ids = set(server.getsessionids())
sys.argv = shlex.split(ex)
scriptname = sys.argv[0]
filename = sys.argv[0]
if os.path.splitext(filename)[1].lower() == '.xml':
session = server.getsession(useexisting=False)
opensessionxml(session, filename, start=True)
# TODO: Script may not return; run in separate thread here.
# Wait for some configurable timeout period, then check
# for new session below. Wait for session to enter
# the runtime state, then send back the register message.
execfile(scriptname, {'server': server})
else:
execfile(filename, {'server': server})
if msg.flags & coreapi.CORE_API_STR_FLAG:
new_session_ids = set(server.getsessionids())
new_sid = new_session_ids.difference(old_session_ids)