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

Rename ServerConnector interface to Connector ¯\_(ツ)_/¯

Browse Source
This commit is contained in:
Kristóf Tóth
2019-07-30 15:17:29 +02:00
parent fd92c443b2
commit 30223fe99f
21 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tfw/components/frontend/frontend_handler.py
View File

@ -7,12 +7,12 @@ class FrontendHandler:
keys = ['message', 'queueMessages', 'dashboard', 'console']
def __init__(self):
self.server_connector = None
self.connector = None
self.keys = [*type(self).keys, 'recover']
self._frontend_message_storage = FrontendMessageStorage(type(self).keys)
def send_message(self, message):
self.server_connector.send_message(message, scope=Scope.WEBSOCKET)
self.connector.send_message(message, scope=Scope.WEBSOCKET)
def handle_event(self, message, _):
self._frontend_message_storage.save_message(message)

4
tfw/components/fsm/fsm_handler.py
View File

@ -35,14 +35,14 @@ class FSMHandler:
'update': self.handle_update
}
def handle_event(self, message, server_connector):
def handle_event(self, message, connector):
try:
message = self.command_handlers[message['data']['command']](message)
if message:
fsm_update_message = self._fsm_updater.fsm_update
sign_message(self.auth_key, message)
sign_message(self.auth_key, fsm_update_message)
server_connector.send_message(fsm_update_message, Scope.BROADCAST)
connector.send_message(fsm_update_message, Scope.BROADCAST)
except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)

4
tfw/components/ide/ide_handler.py
View File

@ -55,7 +55,7 @@ class IdeHandler:
:param selected_file: file that is selected by default
:param exclude: list of filenames that should not appear between files (for .o, .pyc, etc.)
"""
self.server_connector = None
self.connector = None
try:
self.filemanager = FileManager(
allowed_directories=allowed_directories,
@ -90,7 +90,7 @@ class IdeHandler:
})
def send_message(self, message):
self.server_connector.send_message(message, scope=Scope.WEBSOCKET)
self.connector.send_message(message, scope=Scope.WEBSOCKET)
def read(self, data):
"""

6
tfw/components/pipe_io/pipe_io_handler.py
View File

@ -20,7 +20,7 @@ class PipeIOHandlerBase:
keys = ['']
def __init__(self, in_pipe_path, out_pipe_path, permissions=DEFAULT_PERMISSIONS):
self.server_connector = None
self.connector = None
self.pipe_io = CallbackPipeIOServer(
in_pipe_path,
out_pipe_path,
@ -56,7 +56,7 @@ class PipeIOHandler(PipeIOHandlerBase):
def handle_pipe_event(self, message_bytes):
json = loads(message_bytes)
self.server_connector.send_message(json)
self.connector.send_message(json)
class TransformerPipeIOHandler(PipeIOHandlerBase):
@ -93,7 +93,7 @@ class TransformerPipeIOHandler(PipeIOHandlerBase):
transformed_bytes = self._transform_in(message_bytes)
if transformed_bytes:
json_message = loads(transformed_bytes)
self.server_connector.send_message(json_message)
self.connector.send_message(json_message)
class CommandHandler(PipeIOHandler):

6
tfw/components/process_management/log_inotify_observer.py
View File

@ -7,9 +7,9 @@ from .supervisor import ProcessLogManager
class LogInotifyObserver(InotifyObserver, ProcessLogManager):
def __init__(self, server_connector, supervisor_uri, process_name, log_tail=0):
def __init__(self, connector, supervisor_uri, process_name, log_tail=0):
self._prevent_log_recursion()
self._server_connector = server_connector
self._connector = connector
self._process_name = process_name
self.log_tail = log_tail
self._procinfo = None
@ -35,7 +35,7 @@ class LogInotifyObserver(InotifyObserver, ProcessLogManager):
self.paths = self._get_logfiles()
def on_modified(self, event):
self._server_connector.send_message({
self._connector.send_message({
'key': 'processlog',
'data': {
'command': 'new_log',

4
tfw/components/process_management/process_handler.py
View File

@ -32,7 +32,7 @@ class ProcessHandler(ProcessManager, ProcessLogManager):
'restart': self.restart_process
}
def handle_event(self, message, server_connector):
def handle_event(self, message, connector):
try:
data = message['data']
try:
@ -48,6 +48,6 @@ class ProcessHandler(ProcessManager, ProcessLogManager):
data['process_name'],
self.log_tail
)
server_connector.send_message(message, scope=Scope.WEBSOCKET)
connector.send_message(message, scope=Scope.WEBSOCKET)
except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)

4
tfw/components/process_management/process_log_handler.py
View File

@ -17,7 +17,7 @@ class ProcessLogHandler:
The API of each command is documented in their respective handler.
"""
def __init__(self, *, process_name, supervisor_uri, log_tail=0):
self.server_connector = None
self.connector = None
self.process_name = process_name
self._supervisor_uri = supervisor_uri
self._initial_log_tail = log_tail
@ -30,7 +30,7 @@ class ProcessLogHandler:
def start(self):
self._monitor = LogInotifyObserver(
server_connector=self.server_connector,
connector=self.connector,
supervisor_uri=self._supervisor_uri,
process_name=self.process_name,
log_tail=self._initial_log_tail

4
tfw/components/snapshots/snapshot_handler.py
View File

@ -45,11 +45,11 @@ class SnapshotHandler:
makedirs(git_dir, exist_ok=True)
return git_dir
def handle_event(self, message, server_connector):
def handle_event(self, message, connector):
try:
data = message['data']
message['data'] = self.command_handlers[data['command']](data)
server_connector.send_message(message, scope=Scope.WEBSOCKET)
connector.send_message(message, scope=Scope.WEBSOCKET)
except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)

4
tfw/components/terminal/terminal_handler.py
View File

@ -22,7 +22,7 @@ class TerminalHandler:
:param key: key this EventHandler listens to
:param monitor: tfw.components.HistoryMonitor instance to read command history from
"""
self.server_connector = None
self.connector = None
self._histfile = histfile
self._historymonitor = None
bash_as_user_cmd = ['sudo', '-u', user, 'bash']
@ -42,7 +42,7 @@ class TerminalHandler:
self.terminado_server.listen()
def start(self):
self._historymonitor = BashMonitor(self.server_connector, self._histfile)
self._historymonitor = BashMonitor(self.connector, self._histfile)
self._historymonitor.start()
@property