Merge branch 'processlog-rework' into chausie

This commit is contained in:
Kristóf Tóth 2019-08-15 14:40:30 +02:00
commit 1a1b61375c
1 changed files with 5 additions and 5 deletions

View File

@ -8,9 +8,8 @@ from tfw.fsm import YamlFSM
from tfw.event_handlers import FSMAwareEventHandler from tfw.event_handlers import FSMAwareEventHandler
from tfw.components.ide import IdeHandler from tfw.components.ide import IdeHandler
from tfw.components.terminal import TerminalHandler 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.process_management import ProcessHandler, ProcessLogHandler
from tfw.components.snapshots import SnapshotHandler
from tfw.components.fsm import FSMHandler from tfw.components.fsm import FSMHandler
from tfw.main import EventHandlerFactory, setup_signal_handlers from tfw.main import EventHandlerFactory, setup_signal_handlers
from tfw.logging import Log, Logger, LogFormatter, VerboseLogFormatter from tfw.logging import Log, Logger, LogFormatter, VerboseLogFormatter
@ -51,8 +50,7 @@ def main():
)) ))
# Handles 'deploy' button clicks # Handles 'deploy' button clicks
processmanager_eh = eh_factory.build(ProcessHandler( processmanager_eh = eh_factory.build(ProcessHandler(
supervisor_uri=TFWENV.SUPERVISOR_HTTP_URI, supervisor_uri=TFWENV.SUPERVISOR_HTTP_URI
log_tail=2000,
)) ))
# Sends live logs of webservice process to frontend # Sends live logs of webservice process to frontend
logmonitor_eh = eh_factory.build(ProcessLogHandler( logmonitor_eh = eh_factory.build(ProcessLogHandler(
@ -61,7 +59,9 @@ def main():
log_tail=2000 log_tail=2000
)) ))
# Proxies frontend API calls to frontend # 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 # Replace these with your custom event handlers
# Echoes executed commands to messages # Echoes executed commands to messages