mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2025-11-04 05:22:55 +00:00
Code Issues Releases Wiki Activity

Improve internal handling of environment variables

Browse Source
This commit is contained in:
Kristóf Tóth
2018-02-09 09:58:47 +01:00
committed by therealkrispet
parent a933248e90
commit 83b24ad538
10 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/app.py
View File

@@ -5,7 +5,7 @@ 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 import tfwenv
from tfw.config.logs import logging
log = logging.getLogger(__name__)
from tfw.networking.server.zmq_websocket_handler import FSMManagingSocketHandler
@@ -21,10 +21,10 @@ if __name__ == '__main__':
autoreload=True
)
application.listen(WEB_PORT)
application.listen(tfwenv.WEB_PORT)
log.debug('Python version: {}'.format(sys.version[:5]))
log.debug('Tornado version: {}'.format(tornado.version))
log.debug('ZeroMQ version: {}'.format(zmq.zmq_version()))
log.debug('PyZMQ version: {}'.format(zmq.pyzmq_version()))
log.info('Tornado application listening on port {}'.format(WEB_PORT))
log.info('Tornado application listening on port {}'.format(tfwenv.WEB_PORT))
IOLoop.instance().start()

4
src/event_handlers/event_handler_main.py
View File

@@ -2,10 +2,10 @@ from source_code_event_handler import SourceCodeEventHandler
from terminado_event_handler import TerminadoEventHandler
from tornado.ioloop import IOLoop
from tfw.config.envvars import WEBIDE_WD
from tfw.config import tfwenv
if __name__ == '__main__':
anchor_webide = SourceCodeEventHandler('anchor_webide', WEBIDE_WD, 'login')
anchor_webide = SourceCodeEventHandler('anchor_webide', tfwenv.WEBIDE_WD, 'login')
anchor_terminado = TerminadoEventHandler('anchor_terminado', 'terminado')
IOLoop.instance().start()

6
src/event_handlers/source_code_server/server.py
View File

@@ -2,9 +2,9 @@ import json, sys
from tornado.ioloop import IOLoop
from tornado.web import RequestHandler, Application
from tfw.config import LOGIN_APP_PORT, WEBIDE_WD
from tfw.config import tfwenv
sys.path.append(WEBIDE_WD)
sys.path.append(tfwenv.WEBIDE_WD)
from login_component import authorize_login
@@ -23,5 +23,5 @@ class LoginHandler(RequestHandler):
if __name__ == '__main__':
application = Application([(r'/login', LoginHandler)])
application.listen(LOGIN_APP_PORT)
application.listen(tfwenv.LOGIN_APP_PORT)
IOLoop.instance().start()

4
src/event_handlers/terminado_event_handler.py
View File

@@ -2,7 +2,7 @@ from shutil import rmtree, copytree
from tfw.event_handler_base import EventHandlerBase
from tfw.util import SupervisorMixin
from tfw.config import TERMINADO_DIR
from tfw.config import tfwenv
from tfw.config.logs import logging
log = logging.getLogger(__name__)
@@ -10,7 +10,7 @@ log = logging.getLogger(__name__)
class TerminadoEventHandler(EventHandlerBase, SupervisorMixin):
def __init__(self, anchor, process_name):
super().__init__(anchor)
self.working_directory = TERMINADO_DIR
self.working_directory = tfwenv.TERMINADO_DIR
self.process_name = process_name
self.setup_terminado_server()

6
src/event_handlers/terminado_server/server.py
View File

@@ -2,7 +2,7 @@ from tornado.ioloop import IOLoop
from tornado.web import Application
from terminado import TermSocket, UniqueTermManager
from tfw.config import TERMINADO_PORT, TERMINADO_WD
from tfw.config import tfwenv
from tfw.config.logs import logging
log = logging.getLogger(__name__)
@@ -29,5 +29,5 @@ class TerminadoMiniServer:
if __name__ == '__main__':
log.info('Terminado Mini Server listening on {}'.format(TERMINADO_PORT))
TerminadoMiniServer('/terminal', TERMINADO_PORT, TERMINADO_WD, ['bash']).listen()
log.info('Terminado Mini Server listening on {}'.format(tfwenv.TERMINADO_PORT))
TerminadoMiniServer('/terminal', tfwenv.TERMINADO_PORT, tfwenv.TERMINADO_WD, ['bash']).listen()