janis/docker_minecraft_server_auto_starter
1
0
Fork 0
mirror of https://github.com/DerTyp7/docker_minecraft_server_auto_starter.git synced 2025-10-29 12:42:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add request handler for each port and improve

Browse Source 
error handling
This commit is contained in:
Janis
2023-11-24 23:09:42 +01:00
parent 542a1a3af6
commit 62ede11ba9
4 changed files with 70 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/app.py
View File

@@ -2,6 +2,7 @@ from requestHandler import RequestHandler
from utils import docker_container_mapping
from dockerHandler import DockerHandler
from nginxHandler import NginxHandler
import time
def main():
@@ -11,16 +12,17 @@ def main():
docker_handler = DockerHandler(
'unix://var/run/docker.sock', port_ip_map)
# Create a RequestHandler instance for each port
for port in port_ip_map.keys():
request_handler = RequestHandler(port, docker_handler)
request_handler.start()
# Create an NginxHandler instance
nginx_handler = NginxHandler('/etc/nginx/nginx.conf')
nginx_handler.setup_config_file(
docker_container_mapping(), docker_handler.get_current_container_ip())
nginx_handler.print_config()
# Create a RequestHandler instance for each port
for port in port_ip_map.keys():
print(f'Creating request handler for port {port}')
request_handler = RequestHandler(int(port), docker_handler)
request_handler.start()
main()

2
app/dockerHandler.py
View File

@@ -5,7 +5,7 @@ import os
class DockerHandler:
def __init__(self, base_url, port_ip_map):
print(
f'initializing docker handler with base url {base_url} and port ip map {port_ip_map}')
f'Initializing docker handler with base url {base_url} and port ip map: {port_ip_map}')
self.base_url = base_url
self.client = docker.DockerClient(base_url=base_url)
self.port_ip_map = port_ip_map

26
app/requestHandler.py
View File

@@ -17,13 +17,18 @@ class RequestHandler(threading.Thread):
def run(self):
while True:
print(f'Waiting for a connection on port {self.port}')
self.connection, self.client_address = self.sock.accept()
try:
print('Connection from', self.client_address)
self.handle_request()
finally:
self.connection.close()
print(f'Waiting for a connection on port {self.port}')
self.connection, self.client_address = self.sock.accept()
try:
print('Connection from', self.client_address)
self.handle_request()
finally:
self.connection.close()
except Exception as e:
print(f'Error in request handler for port {self.port}: {e}')
print('Restarting request handler...')
self.__init__(self.port, self.docker_handler)
def handle_request(self):
print(f'Handling request on port {self.port}')
@@ -36,25 +41,26 @@ class RequestHandler(threading.Thread):
if request[0] == 0x10:
if b'\x01' in request:
print(f'Detected ping request for {container_ip}')
self.forward_request_to_server(request, isStarting)
self.forward_request_to_placeholder(request, isStarting)
elif b'\x02' in request:
print(f'Detected join/login request for {container_ip}')
if isStarting:
print(
f'Container {container_ip} is already starting...')
self.forward_request_to_server(request, isStarting)
self.forward_request_to_placeholder(
request, isStarting)
else:
print(f'Starting container {container_ip}')
container.start()
elif request[0] == 0xFE:
print(f'Detected legacy ping request for {container_ip}')
self.forward_request_to_server(request, isStarting)
self.forward_request_to_placeholder(request, isStarting)
else:
print(f'No container mapped to port {self.port}')
def forward_request_to_server(self, request, isStarting=False):
def forward_request_to_placeholder(self, request, isStarting=False):
print('Forwarding request to placeholder server')
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as server_socket:
ip = os.environ.get('PLACEHOLDER_SERVER_SLEEPING_IP')