Remove _server_started signal.
This commit is contained in:
parent
488987a326
commit
f5776ed9cd
2 changed files with 8 additions and 12 deletions
|
@ -36,13 +36,20 @@ class Peer(MessageServer):
|
|||
self._download_results = {}
|
||||
|
||||
def start(self):
|
||||
# socket connected to server
|
||||
# connect to server
|
||||
try:
|
||||
self._server_sock = self._connect(*self._serverconfig)
|
||||
except ConnectionRefusedError:
|
||||
logger.error('Server connection refused!')
|
||||
return False, 'Server connection refused!'
|
||||
# start the internal server
|
||||
super().start()
|
||||
# send out register message
|
||||
logger.info('Requesting to register')
|
||||
self._write_message(self._server_sock, {
|
||||
'type': MessageType.REQUEST_REGISTER,
|
||||
'address': self._sock.getsockname()
|
||||
})
|
||||
return True, None
|
||||
|
||||
def publish(self, file):
|
||||
|
@ -149,13 +156,6 @@ class Peer(MessageServer):
|
|||
|
||||
return True, 'File {} dowloaded to {}'.format(file, destination)
|
||||
|
||||
def _server_started(self):
|
||||
logger.info('Requesting to register')
|
||||
self._write_message(self._server_sock, {
|
||||
'type': MessageType.REQUEST_REGISTER,
|
||||
'address': self._sock.getsockname()
|
||||
})
|
||||
|
||||
def _client_connected(self, client):
|
||||
assert isinstance(client, socket.socket)
|
||||
self._peers[client] = None
|
||||
|
|
|
@ -36,7 +36,6 @@ class MessageServer:
|
|||
thread = threading.Thread(target=self._listen)
|
||||
thread.start()
|
||||
self._threads.add(thread)
|
||||
self._server_started()
|
||||
|
||||
def stop(self):
|
||||
# shutdown the server
|
||||
|
@ -137,9 +136,6 @@ class MessageServer:
|
|||
compressed = struct.pack('>I', len(compressed)) + compressed
|
||||
client.sendall(compressed)
|
||||
|
||||
def _server_started(self):
|
||||
pass
|
||||
|
||||
def _client_connected(self, client):
|
||||
pass
|
||||
|
||||
|
|
Loading…
Reference in a new issue