mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2024-11-22 18:41:32 +00:00
Code Issues Releases Wiki Activity

Move FSM instantiation out of FSMManagingSocketHandler

Browse Source
This commit is contained in:
Bálint Bokros 2018-02-08 14:46:00 +01:00
parent 849fd7b61c
commit 8b9f7e50cb
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tfw/networking/server/zmq_websocket_handler.py
View File

@ -41,12 +41,8 @@ class ZMQWebSocketHandler(WebSocketHandler):
class FSMManagingSocketHandler(ZMQWebSocketHandler):
fsm = None
def __init__(self, FSM, application, request, **kwargs):
super().__init__(application, request, **kwargs)
if self.fsm is None:
FSMManagingSocketHandler.fsm = FSM()
def initialize(self, fsm):
self.fsm = fsm
self.fsm.subscribe_message_handler(self.handle_fsm_message)
def on_close(self):

10
src/app/app.py
View File

@ -4,21 +4,17 @@ import zmq
from tornado.web import Application
from tornado.ioloop import IOLoop
from sql_injection_fsm import SQLInjectionFSM
from tfw.config import WEB_PORT
from tfw.config.logs import logging
log = logging.getLogger(__name__)
from tfw.networking.server.zmq_websocket_handler import FSMManagingSocketHandler
from sql_injection_fsm import SQLInjectionFSM
class SQLInjectionFSMManagingSocketHandler(FSMManagingSocketHandler):
def __init__(self, application, request, **kwargs):
super().__init__(SQLInjectionFSM, application, request, **kwargs)
if __name__ == '__main__':
fsm = SQLInjectionFSM()
routes = [
(r'/ws', SQLInjectionFSMManagingSocketHandler),
(r'/ws', FSMManagingSocketHandler, {'fsm': fsm}),
]
application = Application(
routes,