diff --git a/solvable/src/event_handler_main.py b/solvable/src/event_handler_main.py index 1ff27f1..54f1971 100644 --- a/solvable/src/event_handler_main.py +++ b/solvable/src/event_handler_main.py @@ -3,7 +3,7 @@ from ast import literal_eval from tornado.ioloop import IOLoop from tfw.components import IdeEventHandler, TerminalEventHandler, ProcessManagingEventHandler, BashMonitor -from tfw.components import TerminalCommands +from tfw.components import TerminalCommands, LogMonitoringEventHandler from tfw.networking import MessageSender, TFWServerConnector from tfw.config import TFWENV from tfw.config.logs import logging @@ -74,21 +74,26 @@ if __name__ == '__main__': directory=TFWENV.IDE_WD, exclude=['*.pyc'], additional_watched_directories=[TFWENV.WEBSERVICE_DIR] ) - terminal = TerminalEventHandler( # Web shell backend + terminal = TerminalEventHandler( # Web shell backend key='shell', monitor=BashMonitor(TFWENV.HISTFILE) ) - processmanager = ProcessManagingEventHandler( # Handles 'deploy' button clicks + processmanager = ProcessManagingEventHandler( # Handles 'deploy' button clicks key='processmanager', - dirmonitor=ide.monitor + dirmonitor=ide.monitor, + log_tail=2000 ) + logmonitor = LogMonitoringEventHandler( # Sends live logs of webservice process to frontend + 'webservice', + log_tail=2000 + ) + eventhandlers = {ide, terminal, processmanager, logmonitor} terminal.historymonitor.subscribe_callback(cenator) commands = TestCommands(bashrc=f'/home/{TAOENV.USER}/.bashrc') terminal.historymonitor.subscribe_callback(commands.callback) - eventhandlers = {ide, terminal, processmanager} try: IOLoop.instance().start() finally: diff --git a/solvable/supervisor/webservice.conf b/solvable/supervisor/webservice.conf index 69051cd..16a12b7 100644 --- a/solvable/supervisor/webservice.conf +++ b/solvable/supervisor/webservice.conf @@ -4,3 +4,6 @@ directory=%(ENV_TFW_WEBSERVICE_DIR)s environment=BASEURL="/webservice" command=python3 server.py autostart=true +startretries=0 +stdout_logfile=/tmp/webservice_logs +stderr_logfile=/tmp/webservice_logs