diff --git a/.env b/.env deleted file mode 100644 index 28e29d9..0000000 --- a/.env +++ /dev/null @@ -1,32 +0,0 @@ -# Django settings -SECRET_KEY="FollowTheWhiteRabbit" -DEBUG=True -DJANGO_ALLOWED_HOSTS=['*'] - -# PostgreSQL settings -POSTGRES_DB=players_db -POSTGRES_USER=42student -POSTGRES_PASSWORD=qwerty - -# Django settings -DB_HOST=db -DB_PORT=5432 -PWD_PATH=${PWD} -PROJECT_PATH=${PWD_PATH}/pong -DJANGO_LOGS=${PWD_PATH}/logs - -# ElasticSearch settings -STACK_VERSION=8.14.3 -CLUSTER_NAME=docker-cluster -LICENSE=basic - -ELASTIC_USERNAME=elastic -ELASTIC_PASSWORD=elastic_pass - -# Kibana settings -KIBANA_PORT=5601 -KIBANA_USERNAME=kibana_system -KIBANA_PASSWORD=kibana_pass - -ENCRYPTION_KEY=c34d38b3a14956121ff2170e5030b471551370178f43e5626eec58b04a30fae2 - diff --git a/docker-compose.yml b/docker-compose.yml index 33a4a7e..062be5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -219,10 +219,6 @@ volumes: o: bind pong_django_logs: driver: local - driver_opts: - type: none - device: ${DJANGO_LOGS} - o: bind pong_pg_data: driver: local pong_es_data_01: diff --git a/docker-compose.yml_old b/docker-compose.yml_old deleted file mode 100644 index aa21870..0000000 --- a/docker-compose.yml_old +++ /dev/null @@ -1,75 +0,0 @@ -services: - backend: - build: - context: . - dockerfile: Dockerfile - image: backend - container_name: backend - restart: always - command: /bin/sh -c "sleep 5 && - venv/bin/python manage.py makemigrations --noinput && - venv/bin/python manage.py migrate --noinput && - venv/bin/python manage.py collectstatic --noinput && - venv/bin/daphne -b 0.0.0.0 -p 8080 pong.asgi:application" - volumes: - - pong:/transcendence/pong - - pong_django_logs:/transcendence/logs - ports: - - 8080:8080 - networks: - - app-network - environment: - DB_HOST: db - DB_PORT: 5432 - DB_NAME: ${POSTGRES_DB} - DB_USER: ${POSTGRES_USER} - DB_PASSWORD: ${POSTGRES_PASSWORD} - depends_on: - - db - healthcheck: - test: ["CMD-SHELL", "curl", "http://localhost:8080"] - interval: 30s - timeout: 10s - retries: 3 - start_period: 10s - - db: - image: postgres:latest - container_name: postgres - restart: always - volumes: - - pong_pg_data:/var/lib/postgresql/data - ports: - - "5432:5432" - networks: - - app-network - environment: - POSTGRES_DB: ${POSTGRES_DB} - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - healthcheck: - test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"] - interval: 10s - timeout: 5s - retries: 5 - -volumes: - pong: - driver: local - driver_opts: - type: none - device: ${PROJECT_PATH} - o: bind - pong_django_logs: - driver: local - driver_opts: - type: none - device: ${DJANGO_LOGS} - o: bind - pong_pg_data: - driver: local - -networks: - app-network: - name: app-network - driver: bridge diff --git a/env_template b/env_template index b297aeb..165b010 100644 --- a/env_template +++ b/env_template @@ -24,7 +24,7 @@ ELASTIC_PASSWORD= # Kibana settings KIBANA_PORT=5601 -KIBANA_USERNAME= +KIBANA_USERNAME=kibana_system KIBANA_PASSWORD= ENCRYPTION_KEY=c34d38b3a14956121ff2170e5030b471551370178f43e5626eec58b04a30fae2 diff --git a/logs/django.log b/logs/django.log deleted file mode 100644 index 7683829..0000000 --- a/logs/django.log +++ /dev/null @@ -1,10 +0,0 @@ -{"message": "Not Found: /favicon.ico", "taskName": null, "status_code": 404, "request": ""} -{"message": "Not Found: /favicon.ico", "taskName": null, "status_code": 404, "request": ""} -{"message": "Not Found: /favicon.ico", "taskName": null, "status_code": 404, "request": ""} -{"message": "Not Found: /favicon.ico", "taskName": null, "status_code": 404, "request": ""} -{"message": "Not Found: /favicon.ico", "taskName": null, "status_code": 404, "request": ""} -{"message": "Not Found: /favicon.ico", "taskName": null, "status_code": 404, "request": ""} -{"message": "Not Found: /favicon.ico", "taskName": null, "status_code": 404, "request": ""} -{"message": "Not Found: /favicon.ico", "taskName": null, "status_code": 404, "request": ""} -{"message": "Not Found: /favicon.ico", "taskName": null, "status_code": 404, "request": ""} -{"message": "Not Found: /favicon.ico", "taskName": null, "status_code": 404, "request": ""} diff --git a/makefile b/makefile index 45a9a55..e7fbc31 100644 --- a/makefile +++ b/makefile @@ -4,7 +4,7 @@ CONTAINER=$(c) up: down $(COMPOSE) build - $(COMPOSE) up --remove-orphans $(CONTAINER) + $(COMPOSE) up -d $(CONTAINER) || true build: $(COMPOSE) build $(CONTAINER) @@ -20,8 +20,13 @@ down: destroy: $(COMPOSE) down -v --rmi all + +kill-pid: sudo lsof -i :5432 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true - sudo lsof -i :80 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true + sudo lsof -i :5601 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true + sudo lsof -i :9200 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true + sudo lsof -i :8080 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true + sudo lsof -i :5044 | awk 'NR>1 {print $$2}' | xargs sudo kill -9 || true logs: $(COMPOSE) logs -f $(CONTAINER) diff --git a/pong/game/game.py b/pong/game/game.py index a5c9320..0f30c73 100644 --- a/pong/game/game.py +++ b/pong/game/game.py @@ -244,7 +244,7 @@ class Game: if not self.localgame: await self.player2.send(end_message) if hasattr(self, 'tournament'): - await sync_to_async(handle_game_data)(self.game_state['player1_name'], self.game_state['player2_name'], + await sync_to_async(handle_game_data)(self.game_state['player1_name'], self.game_state['player2_name'], self.game_state['player1_score'], self.game_state['player2_score'], self.bt1, self.bt2, duration, True, self.tournament.tournoi_reg) else: