From 419a6945971f745abfab223fce43a04c4bf4db68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Thu, 15 Aug 2019 14:21:41 +0200 Subject: [PATCH 1/2] Remove unused handler import --- solvable/src/event_handler_main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/solvable/src/event_handler_main.py b/solvable/src/event_handler_main.py index adb3b90..310bbdb 100644 --- a/solvable/src/event_handler_main.py +++ b/solvable/src/event_handler_main.py @@ -10,7 +10,6 @@ from tfw.components.ide import IdeHandler from tfw.components.terminal import TerminalHandler from tfw.components.frontend import FrontendHandler from tfw.components.process_management import ProcessHandler, ProcessLogHandler -from tfw.components.snapshots import SnapshotHandler from tfw.components.fsm import FSMHandler from tfw.main import EventHandlerFactory, setup_signal_handlers from tfw.logging import Log, Logger, LogFormatter, VerboseLogFormatter From 4bd8ee1cf2ebea80fb79c1d51cb1db1483968eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Thu, 15 Aug 2019 14:37:32 +0200 Subject: [PATCH 2/2] Use new ConsoleLogsHandler to write process logs to frontend --- solvable/src/event_handler_main.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/solvable/src/event_handler_main.py b/solvable/src/event_handler_main.py index 310bbdb..5dd0596 100644 --- a/solvable/src/event_handler_main.py +++ b/solvable/src/event_handler_main.py @@ -8,7 +8,7 @@ from tfw.fsm import YamlFSM from tfw.event_handlers import FSMAwareEventHandler from tfw.components.ide import IdeHandler from tfw.components.terminal import TerminalHandler -from tfw.components.frontend import FrontendHandler +from tfw.components.frontend import FrontendProxyHandler, ConsoleLogsHandler from tfw.components.process_management import ProcessHandler, ProcessLogHandler from tfw.components.fsm import FSMHandler from tfw.main import EventHandlerFactory, setup_signal_handlers @@ -50,8 +50,7 @@ def main(): )) # Handles 'deploy' button clicks processmanager_eh = eh_factory.build(ProcessHandler( - supervisor_uri=TFWENV.SUPERVISOR_HTTP_URI, - log_tail=2000, + supervisor_uri=TFWENV.SUPERVISOR_HTTP_URI )) # Sends live logs of webservice process to frontend logmonitor_eh = eh_factory.build(ProcessLogHandler( @@ -60,7 +59,9 @@ def main(): log_tail=2000 )) # Proxies frontend API calls to frontend - frontend_eh = eh_factory.build(FrontendHandler()) + frontend_eh = eh_factory.build(FrontendProxyHandler()) + # Writes live logs to console on frontend + console_logs_eh = eh_factory.build(ConsoleLogsHandler(stream='stdout')) # Replace these with your custom event handlers # Echoes executed commands to messages