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

when executing Python scripts from the GUI, run in background thread and

Browse source 
wait for them to enter the RUNTIME state
This commit is contained in:
ahrenholz 2014-04-03 21:58:05 +00:00
parent 2c2c9a082f
commit fef98f30c9
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
daemon/sbin/core-daemon
View file

@ -936,12 +936,12 @@ class CoreRequestHandler(SocketServer.BaseRequestHandler):
if os.path.splitext(filename)[1].lower() == '.xml': if os.path.splitext(filename)[1].lower() == '.xml':
session = server.getsession(useexisting=False) session = server.getsession(useexisting=False)
opensessionxml(session, filename, start=True) 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.
else: else:
execfile(filename, {'server': server}) t = threading.Thread(target = execfile,
args=(filename, {'server': server}))
t.daemon = True
t.start()
time.sleep(0.25) # allow time for session creation
if msg.flags & coreapi.CORE_API_STR_FLAG: if msg.flags & coreapi.CORE_API_STR_FLAG:
new_session_ids = set(server.getsessionids()) new_session_ids = set(server.getsessionids())
new_sid = new_session_ids.difference(old_session_ids) new_sid = new_session_ids.difference(old_session_ids)
@ -951,6 +951,18 @@ class CoreRequestHandler(SocketServer.BaseRequestHandler):
except KeyError: except KeyError:
self.info("executed '%s' with unknown session ID" % ex) self.info("executed '%s' with unknown session ID" % ex)
return replies return replies
self.info("checking session %d for RUNTIME state" % sid)
session = self.server.getsession(sessionid=sid, useexisting=True)
retries = 10
# wait for session to enter RUNTIME state, to prevent GUI from
# connecting while nodes are still being instantiated
while session.getstate() != coreapi.CORE_EVENT_RUNTIME_STATE:
self.info("waiting for session %d to enter RUNTIME state" % sid)
time.sleep(1)
retries -= 1
if retries <= 0:
self.info("session %d did not enter RUNTIME state" % sid)
return replies
tlvdata = coreapi.CoreRegTlv.pack( \ tlvdata = coreapi.CoreRegTlv.pack( \
coreapi.CORE_TLV_REG_EXECSRV, ex) coreapi.CORE_TLV_REG_EXECSRV, ex)
tlvdata += coreapi.CoreRegTlv.pack( \ tlvdata += coreapi.CoreRegTlv.pack( \