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

moved apibridge to misc

Browse source
This commit is contained in:
Rod A Santiago 2016-08-12 11:58:30 -07:00
parent 3359aeb323
commit 36c82d1960
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,9 +9,8 @@
import coreapi2
import threading, traceback, sys import threading, traceback, sys
from core.api import coreapi, corewrapper from core.api import coreapi, corewrapper, coreapi2
from core.experiments import ExperimentStore from core.experiments import ExperimentStore
wrapper = corewrapper wrapper = corewrapper
@ -40,23 +39,6 @@ class CoreApiBridge(object):
''' '''
data = coreapi2.recvAndUnpack(self.handler.request.recv) data = coreapi2.recvAndUnpack(self.handler.request.recv)
'''
try:
hdr = self.handler.request.recv(coreapi2.API2HDRSIZ)
except Exception, e:
raise IOError, "error receiving API 2 header (%s)" % e
if len(hdr) != coreapi2.API2HDRSIZ:
if len(hdr) == 0:
raise EOFError, "client disconnected"
else:
raise IOError, "invalid message header size"
dataToRead = struct.unpack(API2HDRFMT, hdr)[0]
data = ""
while len(data) < dataToRead:
data += self.handler.request.recv(dataToRead - len(data))
'''
msgs = self.processApi2Message(data) msgs = self.processApi2Message(data)
return msgs return msgs
@ -183,6 +165,7 @@ class CoreApiBridge(object):
with self.lock: with self.lock:
if self.collector: if self.collector:
self.collector.experiment.running = True self.collector.experiment.running = True
self.collector.purpose = coreapi2.MODIFY
else: else:
raise RuntimeError, "runtime entered without an instantiated experiment" raise RuntimeError, "runtime entered without an instantiated experiment"
api2msgs.append(coreapi2.pack(self.collector)) api2msgs.append(coreapi2.pack(self.collector))
@ -261,6 +244,8 @@ class CoreApiBridge(object):
legacymsgs.append(wrapper.RegMsg.instantiate(0, gui='true')) legacymsgs.append(wrapper.RegMsg.instantiate(0, gui='true'))
return legacymsgs return legacymsgs
# The response will be sent to the API2 client when a legacy session message is received from the daemon # The response will be sent to the API2 client when a legacy session message is received from the daemon
elif purpose == coreapi2.MODIFY:
pass
elif purpose == coreapi2.DELETE: elif purpose == coreapi2.DELETE:
# TODO: shutdown session # TODO: shutdown session
pass pass
@ -282,7 +267,7 @@ class CoreApiBridge(object):
self.collector = response self.collector = response
else: else:
raise RuntimeError, "Instantiation of experiment while another is active" raise RuntimeError, "Instantiation of experiment while another is active"
self.handler.request.sendall(coreapi2.pack(response)) # TODO: Fix this self.handler.request.sendall(coreapi2.pack(response))
return self.translateApi2ExperimentMsg(exp) return self.translateApi2ExperimentMsg(exp)
else: else:
return self.Api2Error("unable to add experiment") return self.Api2Error("unable to add experiment")

3
daemon/sbin/core-daemon
View file

@ -33,10 +33,11 @@ except ImportError:
sys.path.append("/usr/local/lib64/python2.7/site-packages") sys.path.append("/usr/local/lib64/python2.7/site-packages")
from core import pycore from core import pycore
from core.constants import * from core.constants import *
from core.api import coreapi, apibridge from core.api import coreapi
from core.coreobj import PyCoreNet from core.coreobj import PyCoreNet
from core.misc.utils import hexdump, daemonize, cmdresult, mutedetach, closeonexec from core.misc.utils import hexdump, daemonize, cmdresult, mutedetach, closeonexec
from core.misc.xmlsession import opensessionxml, savesessionxml from core.misc.xmlsession import opensessionxml, savesessionxml
from core.misc import apibridge
DEFAULT_MAXFD = 1024 DEFAULT_MAXFD = 1024