diff --git a/mp3/server.py b/mp3/server.py index e2d6a7c16cdbcb704452e1b75d2b13a098d8db28..242f322c8b9be0db614b03394997c37d283aa77b 100644 --- a/mp3/server.py +++ b/mp3/server.py @@ -460,14 +460,14 @@ def connect_with_all_servers(servers: dict, current_server_id: str, return_value s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) host_ip_address = SERVER_ID_TO_IP_MAPPING[server[SERVER_IDENTIFIER]] # server[SERVER_PORT] = SERVERS[CURRENT_SERVER_ID][SERVER_PORT]+1 # todo: to be deleted - address = (host_ip_address, SERVERS[server_id][ACCEPTING_PEER_PORT]) + address = (host_ip_address, server[ACCEPTING_PEER_PORT]) pprint(f"[connect_with_all_servers] - {CURRENT_SERVER_ID} is trying to " - f"connect {(host_ip_address, SERVERS[server_id][ACCEPTING_PEER_PORT])}") + f"connect {(host_ip_address, server[ACCEPTING_PEER_PORT])}") s.connect(address) connect_info[server_id] = s gprint(f"[Connect] - " f"Connecting to {server[SERVER_IDENTIFIER]}: {host_ip_address}:" - f"{server[server_id][ACCEPTING_PEER_PORT]} success!") + f"{server[ACCEPTING_PEER_PORT]} success!") except Exception: rprint(f"[Connect] - Connection to " f"{server[SERVER_IDENTIFIER]} failed. " @@ -745,31 +745,31 @@ def accepting_peer_servers(SELF_NODE): server.close() -def accepting_connections(SELF_NODE): - try: - server = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - server.bind((CURRENT_SERVER_IP, CURRENT_SERVER_PORT)) - server.listen() - # print(f"[LISTENING] Server is listening on {ADDR}") # DEBUG - while True: - conn, addr = server.accept() - if addr[0] in SERVERS.keys(): - thread = threading.Thread(target=server_handler, args=[conn, SELF_NODE]) - gprint( - f'[accepting_peer_servers] - peer server [{addr}] connect to server [{CURRENT_SERVER_ID}] success!') - thread.start() - else: - thread = threading.Thread(target=client_handler, args=[conn, SELF_NODE]) - gprint(f'[accepting_clients] - client [{addr}] connect to coordinator [{CURRENT_SERVER_ID}] success!') - thread.start() - # client_send_socket = server.connect(addr) - # gprint(f'[accepting_peer_servers] - server [{CURRENT_SERVER_ID}] connect to peer server [{addr}] success!') - # thread = threading.Thread(target=server_handler, args=[conn, SELF_NODE]) - # thread.start() - except Exception as e: - rprint(f"[ERROR] accepting_peer_servers error:{e.__class__.__name__}.{e}.{traceback.format_exc()}") - finally: - server.close() +# def accepting_connections(SELF_NODE): +# try: +# server = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +# server.bind((CURRENT_SERVER_IP, CURRENT_SERVER_PORT)) +# server.listen() +# # print(f"[LISTENING] Server is listening on {ADDR}") # DEBUG +# while True: +# conn, addr = server.accept() +# if addr[0] in SERVERS.keys(): +# thread = threading.Thread(target=server_handler, args=[conn, SELF_NODE]) +# gprint( +# f'[accepting_peer_servers] - peer server [{addr}] connect to server [{CURRENT_SERVER_ID}] success!') +# thread.start() +# else: +# thread = threading.Thread(target=client_handler, args=[conn, SELF_NODE]) +# gprint(f'[accepting_clients] - client [{addr}] connect to coordinator [{CURRENT_SERVER_ID}] success!') +# thread.start() +# # client_send_socket = server.connect(addr) +# # gprint(f'[accepting_peer_servers] - server [{CURRENT_SERVER_ID}] connect to peer server [{addr}] success!') +# # thread = threading.Thread(target=server_handler, args=[conn, SELF_NODE]) +# # thread.start() +# except Exception as e: +# rprint(f"[ERROR] accepting_peer_servers error:{e.__class__.__name__}.{e}.{traceback.format_exc()}") +# finally: +# server.close() if __name__ == '__main__':