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

Standardize log constant naming and declaration placement

Browse Source
This commit is contained in:
Kristóf Tóth
2018-03-25 16:06:59 +02:00
parent 1e2ea0ed17
commit aacdbcb0d1
9 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,8 @@ from tfw.networking.zmq_connector_base import ZMQConnectorBase
from tfw.networking.serialization import serialize_all
from tfw.config import tfwenv
from tfw.config.logs import logging
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
class EventHandlerDownlinkConnector(ZMQConnectorBase):
@ -15,7 +16,7 @@ class EventHandlerDownlinkConnector(ZMQConnectorBase):
self._zmq_pull_stream = ZMQStream(self._zmq_pull_socket)
address = 'tcp://*:{}'.format(tfwenv.RECEIVER_PORT)
self._zmq_pull_socket.bind(address)
log.debug('Pull socket bound to {}'.format(address))
LOG.debug('Pull socket bound to {}'.format(address))
class EventHandlerUplinkConnector(ZMQConnectorBase):
@ -24,7 +25,7 @@ class EventHandlerUplinkConnector(ZMQConnectorBase):
self._zmq_pub_socket = self._zmq_context.socket(zmq.PUB)
address = 'tcp://*:{}'.format(tfwenv.PUBLISHER_PORT)
self._zmq_pub_socket.bind(address)
log.debug('Pub socket bound to {}'.format(address))
LOG.debug('Pub socket bound to {}'.format(address))
class EventHandlerConnector(EventHandlerDownlinkConnector, EventHandlerUplinkConnector):

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

@ -6,7 +6,8 @@ from tfw.networking.server.zmq_websocket_handler import ZMQWebSocketProxy
from tfw.networking.event_handlers.server_connector import ServerUplinkConnector
from tfw.message_sender import MessageSender
from tfw.config.logs import logging
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
class TFWServer:
@ -33,7 +34,7 @@ class TFWServer:
def make_response(self, message):
trigger = message.get('trigger', '')
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: "{}"'.format(trigger))
return message
def proxy_filter(self, message):
@ -62,7 +63,7 @@ class FSMManager:
if all(predicate_results):
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: "{}"'.format(trigger))
def subscribe_predicate(self, trigger, *predicates):
self.trigger_predicates[trigger].extend(predicates)

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

@ -5,7 +5,8 @@ from tornado.websocket import WebSocketHandler
from tfw.networking.serialization import deserialize_all
from tfw.networking.server.event_handler_connector import EventHandlerConnector
from tfw.config.logs import logging
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
class ZMQWebSocketHandler(WebSocketHandler):
@ -19,7 +20,7 @@ class ZMQWebSocketHandler(WebSocketHandler):
ZMQWebSocketHandler.instances.remove(self)
def open(self, *args, **kwargs):
log.debug('WebSocket connection initiated')
LOG.debug('WebSocket connection initiated')
self._event_handler_connector.register_callback(self.zmq_callback)
@classmethod
@ -27,13 +28,13 @@ class ZMQWebSocketHandler(WebSocketHandler):
keyhandlers = {'mirror': cls.mirror}
key, data = deserialize_all(*msg_parts)
log.debug('Received on pull socket: {}'.format(data))
LOG.debug('Received on pull socket: {}'.format(data))
if key not in keyhandlers:
for instance in cls.instances:
instance.write_message(data)
else:
try: keyhandlers[key](data['data'])
except KeyError: log.error('Invalid mirror message format! Ignoring.')
except KeyError: LOG.error('Invalid mirror message format! Ignoring.')
@classmethod
def mirror(cls, data):
@ -41,7 +42,7 @@ class ZMQWebSocketHandler(WebSocketHandler):
cls._event_handler_connector.send_message({'data': data}, key)
def on_message(self, message):
log.debug('Received on WebSocket: {}'.format(message))
LOG.debug('Received on WebSocket: {}'.format(message))
self.send_message(self.make_response(message))
def make_response(self, message):