fast push

mp3/server.py

@@ -454,7 +454,7 @@ def connect_with_all_servers(servers: dict, current_server_id: str, return_value
             try:
                 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                 host_ip_address = SERVER_ID_TO_IP_MAPPING[server[SERVER_IDENTIFIER]]
-                # server[SERVER_PORT] = 5678  # todo: to be deleted
+                server[SERVER_PORT] = 55555  # todo: to be deleted
                 address = (host_ip_address, server[SERVER_PORT])
                 s.connect(address)
                 connect_info[server_id] = s
@@ -697,7 +697,7 @@ def server_handler(conn, SELF_NODE):
 def accepting_clients(SELF_NODE):
     try:
         server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        server.bind((CURRENT_SERVER_IP, 1234))
+        server.bind((CURRENT_SERVER_IP, SERVERS[CURRENT_SERVER_IP][SERVER_PORT]))
         server.listen()
         # print(f"[LISTENING] Server is listening on {ADDR}")  # DEBUG
         while True:
@@ -718,7 +718,7 @@ def accepting_clients(SELF_NODE):
 def accepting_peer_servers(SELF_NODE):
     try:
         server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        server.bind((CURRENT_SERVER_IP, 5678))
+        server.bind((CURRENT_SERVER_IP, 55555))
         server.listen()
         # print(f"[LISTENING] Server is listening on {ADDR}")  # DEBUG
         while True:
@@ -768,17 +768,17 @@ if __name__ == '__main__':
     map_hostname_to_ip(SERVERS)
     CURRENT_SERVER_PORT = SERVERS[CURRENT_SERVER_ID][SERVER_PORT]
 
-    # pprint(f'[main] - SELF_NODE: {SELF_NODE}')
-    # pprint(f'[main] - SELF_NODE.lock: {SELF_NODE.lock}')
+    pprint(f'[main] - SELF_NODE: {SELF_NODE}')
+    pprint(f'[main] - SELF_NODE.lock: {SELF_NODE.lock}')
 
-    # thread1 = threading.Thread(target=accepting_clients, args=[SELF_NODE])
-    # thread2 = threading.Thread(target=accepting_peer_servers, args=[SELF_NODE])
-    #
-    # thread1.start()
-    # thread2.start()
-    # thread1.join()
-    # thread2.join()
+    thread1 = threading.Thread(target=accepting_clients, args=[SELF_NODE])
+    thread2 = threading.Thread(target=accepting_peer_servers, args=[SELF_NODE])
+
+    thread1.start()
+    thread2.start()
+    thread1.join()
+    thread2.join()
 
-    thread = threading.Thread(target=accepting_connections, args=[SELF_NODE])
-    thread.start()
-    thread.join()
+    # thread = threading.Thread(target=accepting_connections, args=[SELF_NODE])
+    # thread.start()
+    # thread.join()