mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2025-06-28 10:55:12 +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

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