Begin refactoring app.py to TFWServer class

This commit is contained in:
Kristóf Tóth 2018-02-11 11:50:40 +01:00
parent 1e9642912c
commit bcd31de852

View File

@ -14,30 +14,37 @@ log = logging.getLogger(__name__)
from tfw.networking.server.zmq_websocket_handler import FSMManagingSocketHandler from tfw.networking.server.zmq_websocket_handler import FSMManagingSocketHandler
def zmq_callback(stream, msg_parts): class TFWServer:
key, data = deserialize_all(*msg_parts) def __init__(self, fsm_type):
if key == 'test': self._fsm = fsm_type()
stream.send_multipart(serialize_all(key, 'OK')) self.application = Application(
if key == 'solution_check': [(r'/ws', FSMManagingSocketHandler, {'fsm': self.fsm})],
stream.send_multipart(serialize_all(key, { autoreload=True
'solved': fsm.is_solved(), )
'message': 'solved' if fsm.is_solved() else 'not solved' self.controller_connector = ControllerConnector()
})) self.controller_connector.register_callback(self.zmq_callback)
@property
def fsm(self):
return self._fsm
def zmq_callback(self, stream, msg_parts):
key, data = deserialize_all(*msg_parts)
if key == 'test':
stream.send_multipart(serialize_all(key, 'OK'))
if key == 'solution_check':
stream.send_multipart(serialize_all(key, {
'solved': self.fsm.is_solved(),
'message': 'solved' if self.fsm.is_solved() else 'not solved'
}))
def listen(self, port):
self.application.listen(port)
if __name__ == '__main__': if __name__ == '__main__':
fsm = SQLInjectionFSM() server = TFWServer(SQLInjectionFSM)
controller_connector = ControllerConnector() server.listen(tfwenv.WEB_PORT)
controller_connector.register_callback(zmq_callback)
routes = [
(r'/ws', FSMManagingSocketHandler, {'fsm': fsm}),
]
application = Application(
routes,
autoreload=True
)
application.listen(tfwenv.WEB_PORT)
log.debug('Python version: {}'.format(sys.version[:5])) log.debug('Python version: {}'.format(sys.version[:5]))
log.debug('Tornado version: {}'.format(tornado.version)) log.debug('Tornado version: {}'.format(tornado.version))
log.debug('ZeroMQ version: {}'.format(zmq.zmq_version())) log.debug('ZeroMQ version: {}'.format(zmq.zmq_version()))