Use address tuple instead of separate (ip, port).
This commit is contained in:
parent
70136b99c1
commit
69c134f96d
2 changed files with 5 additions and 5 deletions
|
@ -37,7 +37,7 @@ class Peer(MessageServer):
|
|||
def start(self):
|
||||
# connect to server
|
||||
try:
|
||||
self._server_sock = self._connect(*self._serverconfig)
|
||||
self._server_sock = self._connect(self._serverconfig)
|
||||
except ConnectionRefusedError:
|
||||
logger.error('Server connection refused!')
|
||||
return False, 'Server connection refused!'
|
||||
|
|
|
@ -86,16 +86,16 @@ class MessageServer:
|
|||
pass
|
||||
return data
|
||||
|
||||
def _connect(self, ip, port):
|
||||
logger.info('Connecting to {}'.format((ip, port)))
|
||||
client = socket.create_connection((ip, port))
|
||||
def _connect(self, address):
|
||||
logger.info('Connecting to {}'.format(address))
|
||||
client = socket.create_connection(address)
|
||||
client.settimeout(MessageServer._SOCKET_TIMEOUT)
|
||||
with self._connections_lock:
|
||||
self._connections.add(client)
|
||||
thread = threading.Thread(target=self._read_message, args=(client,))
|
||||
thread.start()
|
||||
self._threads.add(thread)
|
||||
logger.info('Successfully connected to {} on {}'.format((ip, port), client.getsockname()))
|
||||
logger.info('Successfully connected to {} on {}'.format(address, client.getsockname()))
|
||||
return client
|
||||
|
||||
@staticmethod
|
||||
|
|
Loading…
Reference in a new issue