mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2024-11-22 15:51:31 +00:00
Code Issues Releases Wiki Activity

Make use of format string optimization in logging calls

Browse Source
This commit is contained in:
Kristóf Tóth 2018-03-25 16:25:01 +02:00
parent 73ed680298
commit 8eded8cbac
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tfw/components/directory_monitoring_event_handler.py
View File

@ -43,7 +43,7 @@ class DirectoryMonitoringEventHandler(TriggerlessEventHandler):
message['data'] = self.commands[message['data']['command']](message['data']) message['data'] = self.commands[message['data']['command']](message['data'])
return message return message
except KeyError: except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: {}'.format(message)) LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)
def pause(self, data): def pause(self, data):
self.monitor.pause() self.monitor.pause()

2
lib/tfw/components/process_managing_event_handler.py
View File

@ -33,7 +33,7 @@ class ProcessManagingEventHandler(TriggerlessEventHandler):
self.processmanager(data['command'], data['process_name']) self.processmanager(data['command'], data['process_name'])
return message return message
except KeyError: except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: {}'.format(message)) LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)
except SupervisorFault as fault: except SupervisorFault as fault:
message['data']['error'] = fault.faultString message['data']['error'] = fault.faultString
message['data']['log'] = self.processmanager.read_log(message['data']['process_name']) message['data']['log'] = self.processmanager.read_log(message['data']['process_name'])

6
lib/tfw/components/source_code_event_handler.py
View File

@ -110,7 +110,7 @@ class SourceCodeEventHandler(TriggerlessEventHandler):
def select(self, data): def select(self, data):
try: self.filemanager.filename = data['filename'] try: self.filemanager.filename = data['filename']
except EnvironmentError: LOG.exception('Failed to select file "{}"'.format(data['filename'])) except EnvironmentError: LOG.exception('Failed to select file "%s"', data['filename'])
return data return data
def select_dir(self, data): def select_dir(self, data):
@ -123,7 +123,7 @@ class SourceCodeEventHandler(TriggerlessEventHandler):
except IndexError: except IndexError:
data['content'] = 'No files in this directory :(' data['content'] = 'No files in this directory :('
except EnvironmentError: except EnvironmentError:
LOG.error('Failed to select directory "{}"'.format(data['directory'])) LOG.error('Failed to select directory "%s"', data['directory'])
return data return data
def exclude(self, data): def exclude(self, data):
@ -143,7 +143,7 @@ class SourceCodeEventHandler(TriggerlessEventHandler):
self.attach_fileinfo(data) self.attach_fileinfo(data)
return message return message
except KeyError: except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: {}'.format(message)) LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)
def cleanup(self): def cleanup(self):
self.monitor.stop() self.monitor.stop()

4
lib/tfw/components/terminado_event_handler.py
View File

@ -23,12 +23,12 @@ class TerminadoEventHandler(TriggerlessEventHandler):
return self._historymonitor return self._historymonitor
def handle_event(self, key, message): def handle_event(self, key, message):
LOG.debug('TerminadoEventHandler received event: {}'.format(message)) LOG.debug('TerminadoEventHandler received event: %s', message)
try: try:
message['data'] = self.commands[message['data']['command']](message['data']) message['data'] = self.commands[message['data']['command']](message['data'])
return message return message
except KeyError: except KeyError:
LOG.error('IGNORING MESSAGE: Invalid message received: {}'.format(message)) LOG.error('IGNORING MESSAGE: Invalid message received: %s', message)
def write(self, data): def write(self, data):
self.terminado_server.pty.write(data['shellcmd']) self.terminado_server.pty.write(data['shellcmd'])

2
lib/tfw/components/terminado_mini_server.py
View File

@ -42,6 +42,6 @@ class TerminadoMiniServer:
if __name__ == '__main__': if __name__ == '__main__':
LOG.info('Terminado Mini Server listening on {}'.format(tfwenv.TERMINADO_PORT)) LOG.info('Terminado Mini Server listening on %s', tfwenv.TERMINADO_PORT)
TerminadoMiniServer('/terminal', tfwenv.TERMINADO_PORT, tfwenv.TERMINADO_WD, ['bash']).listen() TerminadoMiniServer('/terminal', tfwenv.TERMINADO_PORT, tfwenv.TERMINADO_WD, ['bash']).listen()
IOLoop.instance().start() IOLoop.instance().start()

4
lib/tfw/networking/server/event_handler_connector.py
View File

@ -16,7 +16,7 @@ class EventHandlerDownlinkConnector(ZMQConnectorBase):
self._zmq_pull_stream = ZMQStream(self._zmq_pull_socket) self._zmq_pull_stream = ZMQStream(self._zmq_pull_socket)
address = 'tcp://*:{}'.format(tfwenv.RECEIVER_PORT) address = 'tcp://*:{}'.format(tfwenv.RECEIVER_PORT)
self._zmq_pull_socket.bind(address) self._zmq_pull_socket.bind(address)
LOG.debug('Pull socket bound to {}'.format(address)) LOG.debug('Pull socket bound to %s', address)
class EventHandlerUplinkConnector(ZMQConnectorBase): class EventHandlerUplinkConnector(ZMQConnectorBase):
@ -25,7 +25,7 @@ class EventHandlerUplinkConnector(ZMQConnectorBase):
self._zmq_pub_socket = self._zmq_context.socket(zmq.PUB) self._zmq_pub_socket = self._zmq_context.socket(zmq.PUB)
address = 'tcp://*:{}'.format(tfwenv.PUBLISHER_PORT) address = 'tcp://*:{}'.format(tfwenv.PUBLISHER_PORT)
self._zmq_pub_socket.bind(address) self._zmq_pub_socket.bind(address)
LOG.debug('Pub socket bound to {}'.format(address)) LOG.debug('Pub socket bound to %s', address)
class EventHandlerConnector(EventHandlerDownlinkConnector, EventHandlerUplinkConnector): class EventHandlerConnector(EventHandlerDownlinkConnector, EventHandlerUplinkConnector):

4
lib/tfw/networking/server/tfw_server.py
View File

@ -34,7 +34,7 @@ class TFWServer:
def make_response(self, message): def make_response(self, message):
trigger = message.get('trigger', '') trigger = message.get('trigger', '')
try: self._fsm_manager.trigger(trigger, message) try: self._fsm_manager.trigger(trigger, message)
except AttributeError: LOG.debug('FSM failed to execute nonexistent trigger: "{}"'.format(trigger)) except AttributeError: LOG.debug('FSM failed to execute nonexistent trigger: "%s"', trigger)
return message return message
def proxy_filter(self, message): def proxy_filter(self, message):
@ -63,7 +63,7 @@ class FSMManager:
if all(predicate_results): if all(predicate_results):
try: self.fsm.trigger(trigger, message=message) try: self.fsm.trigger(trigger, message=message)
except AttributeError: LOG.debug('FSM failed to execute nonexistent trigger: "{}"'.format(trigger)) except AttributeError: LOG.debug('FSM failed to execute nonexistent trigger: "%s"', trigger)
def subscribe_predicate(self, trigger, *predicates): def subscribe_predicate(self, trigger, *predicates):
self.trigger_predicates[trigger].extend(predicates) self.trigger_predicates[trigger].extend(predicates)

4
lib/tfw/networking/server/zmq_websocket_handler.py
View File

@ -28,7 +28,7 @@ class ZMQWebSocketHandler(WebSocketHandler):
keyhandlers = {'mirror': cls.mirror} keyhandlers = {'mirror': cls.mirror}
key, data = deserialize_all(*msg_parts) key, data = deserialize_all(*msg_parts)
LOG.debug('Received on pull socket: {}'.format(data)) LOG.debug('Received on pull socket: %s', data)
if key not in keyhandlers: if key not in keyhandlers:
for instance in cls.instances: for instance in cls.instances:
instance.write_message(data) instance.write_message(data)
@ -42,7 +42,7 @@ class ZMQWebSocketHandler(WebSocketHandler):
cls._event_handler_connector.send_message({'data': data}, key) cls._event_handler_connector.send_message({'data': data}, key)
def on_message(self, message): def on_message(self, message):
LOG.debug('Received on WebSocket: {}'.format(message)) LOG.debug('Received on WebSocket: %s', message)
self.send_message(self.make_response(message)) self.send_message(self.make_response(message))
def make_response(self, message): def make_response(self, message):