mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2025-06-28 17:55:12 +00:00
Code Issues Releases Wiki Activity

Strip controller from TFW

Browse Source
This commit is contained in:
Kristóf Tóth
2018-03-23 11:32:11 +01:00
parent fda242d263
commit abcf490019
10 changed files with 2 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/tfw/networking/async_solvable_connector.py
View File

@ -1,14 +0,0 @@
from tfw.networking.serialization import deserialize_all
from tfw.networking.solvable_connector import SolvableConnector
class AsyncSolvableConnector(SolvableConnector):
def __init__(self, async_zmq_context=None):
if async_zmq_context is None:
from zmq.eventloop.future import Context
async_zmq_context = Context.instance()
super(AsyncSolvableConnector, self).__init__(async_zmq_context)
async def recv(self):
response = await self._zmq_req_socket.recv_multipart()
return deserialize_all(*response)

3
lib/tfw/networking/server/tfw_server.py
View File

@ -1,7 +1,6 @@
from tornado.web import Application
from collections import defaultdict
from tfw.networking.server.controller_responder import ControllerResponder
from tfw.networking.server.zmq_websocket_handler import ZMQWebSocketProxy
from tfw.networking.event_handlers.server_connector import ServerUplinkConnector
from tfw.message_sender import MessageSender
@ -20,7 +19,7 @@ class TFWServer:
[(r'/ws', ZMQWebSocketProxy, {'make_response': self.make_response,
'proxy_filter': self.proxy_filter})]
)
self.controller_responder = ControllerResponder(self.fsm)
#self.controller_responder = ControllerResponder(self.fsm) TODO: add this once controller stuff is resolved
@property
def fsm(self):

18
lib/tfw/networking/solvable_connector.py
View File

@ -1,18 +0,0 @@
import zmq
from tfw.config import tfwenv
from tfw.networking.zmq_connector_base import ZMQConnectorBase
from tfw.networking.serialization import serialize_all, deserialize_all
class SolvableConnector(ZMQConnectorBase):
def __init__(self, zmq_context=None):
super(SolvableConnector, self).__init__(zmq_context)
self._zmq_req_socket = self._zmq_context.socket(zmq.REQ)
self._zmq_req_socket.bind('tcp://*:{}'.format(tfwenv.CONTROLLER_PORT))
def send(self, key, message):
self._zmq_req_socket.send_multipart(serialize_all(key, message))
def recv(self):
return deserialize_all(*self._zmq_req_socket.recv_multipart())