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

returned a list of experiments on session establishment including legacy core sessions

Browse source
This commit is contained in:
Rod A Santiago 2016-08-12 16:54:24 -07:00
parent ad0b45c8f3
commit 71c2dcf0af
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
daemon/core/misc/apibridge.py
View file

@ -129,20 +129,21 @@ class CoreApiBridge(object):
newMsg.session.port_num = port_num newMsg.session.port_num = port_num
# List active experiments in the server # List active experiments in the server
'''
for sid in sessions: for sid in sessions:
sid = int(sid) sid = int(sid)
if sid == 0: if sid == 0:
continue continue
session = session.server.getsession(sessionid=sid, useexisting=True) session = self.handler.session.server.getsession(sessionid=sid, useexisting=True)
if session is None: if session is None:
print "Invalid session ID received from daemon" print "Invalid session ID received from daemon"
continue continue
if hasattr(session, 'experiment'): if session == self.handler.session:
newMsg.session.all_exps.add(session.experiment.id) continue
expId = session.metadata.getitem('experimentId')
if expId:
newMsg.session.all_exps.append(expId)
else: else:
newMsg.session.all_exps.add(str(sid)) newMsg.session.all_exps.append('_%s' % (str(sid)))
'''
newMsg.purpose = coreapi2.ADD newMsg.purpose = coreapi2.ADD
api2msgs.append(coreapi2.pack(newMsg)) api2msgs.append(coreapi2.pack(newMsg))
@ -365,6 +366,13 @@ class CoreApiBridge(object):
# TODO # TODO
# send metadata # send metadata
# Finally, set the new experiment ID in the legacy core session as metadata
# TODO: Append this to the end of metadata above
msgs.append(wrapper.ConfMsg.instantiate("metadata",
dataTypes = (coreapi.CONF_DATA_TYPE_STRING,),
dataValues = "experimentId=%s" % (str(message.experimentId))))
return msgs return msgs