Rename TFWENV and TAOENV constants to use capital letters

This commit is contained in:
Kristóf Tóth
2018-03-25 16:36:31 +02:00
parent ec469c6b75
commit 1982a3c869
8 changed files with 19 additions and 19 deletions

View File

@ -1,7 +1,7 @@
import zmq
from zmq.eventloop.zmqstream import ZMQStream
from tfw.config import tfwenv
from tfw.config import TFWENV
from tfw.networking.zmq_connector_base import ZMQConnectorBase
@ -9,7 +9,7 @@ class ControllerConnector(ZMQConnectorBase):
def __init__(self, zmq_context=None):
super(ControllerConnector, self).__init__(zmq_context)
self._zmq_rep_socket = self._zmq_context.socket(zmq.REP)
self._zmq_rep_socket.connect('tcp://localhost:{}'.format(tfwenv.CONTROLLER_PORT))
self._zmq_rep_socket.connect('tcp://localhost:{}'.format(TFWENV.CONTROLLER_PORT))
self._zmq_rep_stream = ZMQStream(self._zmq_rep_socket)
self.register_callback = self._zmq_rep_stream.on_recv_stream

View File

@ -4,7 +4,7 @@ import zmq
from zmq.eventloop.zmqstream import ZMQStream
from tfw.networking.serialization import serialize_all
from tfw.config import tfwenv
from tfw.config import TFWENV
from tfw.networking.zmq_connector_base import ZMQConnectorBase
@ -12,7 +12,7 @@ class ServerDownlinkConnector(ZMQConnectorBase):
def __init__(self, zmq_context=None):
super(ServerDownlinkConnector, self).__init__(zmq_context)
self._zmq_sub_socket = self._zmq_context.socket(zmq.SUB)
self._zmq_sub_socket.connect('tcp://localhost:{}'.format(tfwenv.PUBLISHER_PORT))
self._zmq_sub_socket.connect('tcp://localhost:{}'.format(TFWENV.PUBLISHER_PORT))
self._zmq_sub_stream = ZMQStream(self._zmq_sub_socket)
self.subscribe = partial(self._zmq_sub_socket.setsockopt_string, zmq.SUBSCRIBE)
@ -24,7 +24,7 @@ class ServerUplinkConnector(ZMQConnectorBase):
def __init__(self, zmq_context=None):
super(ServerUplinkConnector, self).__init__(zmq_context)
self._zmq_push_socket = self._zmq_context.socket(zmq.PUSH)
self._zmq_push_socket.connect('tcp://localhost:{}'.format(tfwenv.RECEIVER_PORT))
self._zmq_push_socket.connect('tcp://localhost:{}'.format(TFWENV.RECEIVER_PORT))
def send_to_eventhandler(self, key, message):
message['data']['key'] = key

View File

@ -3,7 +3,7 @@ from zmq.eventloop.zmqstream import ZMQStream
from tfw.networking.zmq_connector_base import ZMQConnectorBase
from tfw.networking.serialization import serialize_all
from tfw.config import tfwenv
from tfw.config import TFWENV
from tfw.config.logs import logging
LOG = logging.getLogger(__name__)
@ -14,7 +14,7 @@ class EventHandlerDownlinkConnector(ZMQConnectorBase):
super(EventHandlerDownlinkConnector, self).__init__(zmq_context)
self._zmq_pull_socket = self._zmq_context.socket(zmq.PULL)
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)
LOG.debug('Pull socket bound to %s', address)
@ -23,7 +23,7 @@ class EventHandlerUplinkConnector(ZMQConnectorBase):
def __init__(self, zmq_context=None):
super(EventHandlerUplinkConnector, self).__init__(zmq_context)
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)
LOG.debug('Pub socket bound to %s', address)