Add new environment variable for starting

placeholder server

app/dockerHandler.py

@@ -40,3 +40,7 @@ class DockerHandler:
         print('no docker container found with ip {} in network {}'.format(
             ip, self.current_network))
         return None
+
+    def is_container_starting(self, container):
+        print(container.attrs['State']['Health']['Status'])
+        return container.attrs['State']['Health']['Status'] == 'starting'

app/nginxHandler.py

@@ -25,7 +25,6 @@ class NginxHandler:
             print(f.read())
 
     def setup_config_file(self, port_ip_map, current_container_ip):
-        placeholder_ip = os.environ.get('PLACEHOLDER_SERVER_SLEEPING_IP')
         proxy_timeout = "5s"
         self.stop()
         print('Setting up NGINX config file...')
@@ -42,9 +41,6 @@ class NginxHandler:
             nginx_conf.write(
                 '        server 127.0.0.1:{} backup;\n'.format(port))
 
-            nginx_conf.write(
-                '        server {}:25565 backup;\n'.format(placeholder_ip))
-
             nginx_conf.write('    }\n')
 
             nginx_conf.write('    server {\n')

app/requestHandler.py

@@ -1,4 +1,4 @@
-import json
+import os
 import socket
 import threading
 from utils import docker_container_mapping
@@ -32,27 +32,39 @@ class RequestHandler(threading.Thread):
         print('handling request on port {}'.format(self.port))
         container_ip = docker_container_mapping().get(str(self.port))
         if container_ip:
+            container = self.docker_handler.get_container_by_ip(
+                container_ip)
+            isStarting = self.docker_handler.is_container_starting(container)
             request = self.connection.recv(1024)
-            print('---------------------------')
-            print(request)
-            print('---------------------------')
-
             if request[0] == 0x10:
                 if b'\x01' in request:
                     print('ping')
-                    self.redirect_to_placeholder()
+                    self.forward_request_to_server(request, isStarting)
                 elif b'\x02' in request:
                     print('join')
-                    print('starting docker container {}'.format(container_ip))
-                    self.docker_handler.get_container_by_ip(
-                        container_ip).start()
+                    if isStarting:
+                        print('container is starting, waiting for 5 seconds')
+                        self.forward_request_to_server(request, isStarting)
+                    else:
+                        print('starting docker container {}'.format(container_ip))
+                        container.start()
 
             elif request[0] == 0xFE:
                 print('legacy server list ping')
-                self.redirect_to_placeholder()
+                self.forward_request_to_server(request, isStarting)
 
             else:
                 print('no docker container mapped to this port')
 
-    def redirect_to_placeholder(self):
-        print('redirecting to placeholder')
+    def forward_request_to_server(self, request, isStarting=False):
+        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as server_socket:
+            ip = os.environ.get('PLACEHOLDER_SERVER_SLEEPING_IP')
+            if isStarting:
+                print('----------------container is starting, waiting for 5 seconds')
+                ip = os.environ.get('PLACEHOLDER_SERVER_STARTING_IP')
+
+            server_socket.connect(
+                (ip, 25565))
+            server_socket.sendall(request)
+            response = server_socket.recv(1024)
+            self.connection.sendall(response)