From 32e266780d340718e87f4f43ba680febd1313b2e Mon Sep 17 00:00:00 2001 From: agustinesco Date: Thu, 4 Apr 2024 14:55:45 -0300 Subject: [PATCH 01/10] Fix europe host variable --- .github/workflows/arena-europe-testing-deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/arena-europe-testing-deploy.yml b/.github/workflows/arena-europe-testing-deploy.yml index 9ea7c14dc..706f7fa64 100644 --- a/.github/workflows/arena-europe-testing-deploy.yml +++ b/.github/workflows/arena-europe-testing-deploy.yml @@ -33,7 +33,7 @@ jobs: - name: Create ssh private key file from env var env: SSH_KEY: ${{ secrets.SSH_KEY }} - TS_HOST: ${{ vars.TS_EUROPE_HOST }} + TS_HOST: ${{ vars.TS_HOST }} run: | set -ex mkdir -p ~/.ssh/ @@ -44,14 +44,14 @@ jobs: - name: Copy deploy script env: SSH_USERNAME: ${{ vars.SSH_USERNAME }} - SSH_HOST: ${{ vars.TS_EUROPE_HOST }} + SSH_HOST: ${{ vars.TS_HOST }} run: | set -ex rsync -avz --mkpath devops/deploy.sh ${SSH_USERNAME}@${SSH_HOST}:/home/${SSH_USERNAME}/deploy-script/ - name: Execute deploy script env: - SSH_HOST: ${{ vars.TS_EUROPE_HOST }} + SSH_HOST: ${{ vars.TS_HOST }} SSH_USERNAME: ${{ vars.SSH_USERNAME }} MIX_ENV: ${{ vars.MIX_ENV }} RELEASE: ${{ inputs.release }} From 5cbeafa382f3850c0c486fe496388c08b49031c7 Mon Sep 17 00:00:00 2001 From: agustinesco Date: Thu, 4 Apr 2024 15:11:14 -0300 Subject: [PATCH 02/10] Fx database url var --- .github/workflows/arena-brazil-testing-deploy.yml | 2 +- .github/workflows/arena-europe-testing-deploy.yml | 2 +- .github/workflows/loadtest-brazil-client-deploy.yml | 2 +- .github/workflows/loadtest-brazil-server-deploy.yml | 2 +- .github/workflows/loadtest-europe-client-deploy.yml | 2 +- .github/workflows/loadtest-europe-server-deploy.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/arena-brazil-testing-deploy.yml b/.github/workflows/arena-brazil-testing-deploy.yml index 54bc5caf6..38a3bfef6 100644 --- a/.github/workflows/arena-brazil-testing-deploy.yml +++ b/.github/workflows/arena-brazil-testing-deploy.yml @@ -58,7 +58,7 @@ jobs: PHX_SERVER: ${{ vars.PHX_SERVER }} PHX_HOST: ${{ vars.HOST }} PORT: ${{ vars.ARENA_PORT }} - DATABASE_URL: ${secrets.DATABASE_URL} + DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_BRAZIL }} NEWRELIC_KEY: ${{ secrets.NEWRELIC_KEY }} diff --git a/.github/workflows/arena-europe-testing-deploy.yml b/.github/workflows/arena-europe-testing-deploy.yml index 706f7fa64..a091ad95c 100644 --- a/.github/workflows/arena-europe-testing-deploy.yml +++ b/.github/workflows/arena-europe-testing-deploy.yml @@ -58,7 +58,7 @@ jobs: PHX_SERVER: ${{ vars.PHX_SERVER }} PHX_HOST: ${{ vars.EUROPE_HOST }} PORT: ${{ vars.ARENA_PORT }} - DATABASE_URL: ${secrets.DATABASE_URL} + DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_EUROPE }} NEWRELIC_KEY: ${{ secrets.NEWRELIC_KEY }} diff --git a/.github/workflows/loadtest-brazil-client-deploy.yml b/.github/workflows/loadtest-brazil-client-deploy.yml index 3b195696d..abde641b6 100644 --- a/.github/workflows/loadtest-brazil-client-deploy.yml +++ b/.github/workflows/loadtest-brazil-client-deploy.yml @@ -67,7 +67,7 @@ jobs: PHX_SERVER: ${{ vars.PHX_SERVER }} PHX_HOST: ${{ vars.LOADTEST_CLIENT_HOST }} PORT: ${{ vars.ARENA_PORT }} - DATABASE_URL: ${secrets.DATABASE_URL} + DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_LOADTEST }} NEWRELIC_KEY: ${{ secrets.NEWRELIC_KEY }} diff --git a/.github/workflows/loadtest-brazil-server-deploy.yml b/.github/workflows/loadtest-brazil-server-deploy.yml index 18a34da6e..c379f1621 100644 --- a/.github/workflows/loadtest-brazil-server-deploy.yml +++ b/.github/workflows/loadtest-brazil-server-deploy.yml @@ -60,7 +60,7 @@ jobs: PHX_SERVER: ${{ vars.PHX_SERVER }} PHX_HOST: ${{ vars.LOADTEST_SERVER_HOST }} PORT: ${{ vars.ARENA_PORT }} - DATABASE_URL: ${secrets.DATABASE_URL} + DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_LOADTEST }} NEWRELIC_KEY: ${{ secrets.NEWRELIC_KEY }} diff --git a/.github/workflows/loadtest-europe-client-deploy.yml b/.github/workflows/loadtest-europe-client-deploy.yml index 8390647df..60e266373 100644 --- a/.github/workflows/loadtest-europe-client-deploy.yml +++ b/.github/workflows/loadtest-europe-client-deploy.yml @@ -67,7 +67,7 @@ jobs: PHX_SERVER: ${{ vars.PHX_SERVER }} PHX_HOST: ${{ vars.LOADTEST_CLIENT_HOST }} PORT: ${{ vars.ARENA_PORT }} - DATABASE_URL: ${secrets.DATABASE_URL} + DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_LOADTEST }} NEWRELIC_KEY: ${{ secrets.NEWRELIC_KEY }} diff --git a/.github/workflows/loadtest-europe-server-deploy.yml b/.github/workflows/loadtest-europe-server-deploy.yml index b508423e0..a9ede95a7 100644 --- a/.github/workflows/loadtest-europe-server-deploy.yml +++ b/.github/workflows/loadtest-europe-server-deploy.yml @@ -60,7 +60,7 @@ jobs: PHX_SERVER: ${{ vars.PHX_SERVER }} PHX_HOST: ${{ vars.LOADTEST_SERVER_HOST }} PORT: ${{ vars.ARENA_PORT }} - DATABASE_URL: ${secrets.DATABASE_URL} + DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_LOADTEST }} NEWRELIC_KEY: ${{ secrets.NEWRELIC_KEY }} From 983636f7560e436717cf6130792d2d4339cee9a0 Mon Sep 17 00:00:00 2001 From: agustinesco Date: Thu, 4 Apr 2024 15:12:36 -0300 Subject: [PATCH 03/10] Add bot manager application to arena load test release --- mix.exs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mix.exs b/mix.exs index d266425ee..9a77cdae7 100644 --- a/mix.exs +++ b/mix.exs @@ -45,7 +45,9 @@ defmodule MirraBackend.MixProject do [ arena: [applications: [arena: :permanent]], # TODO ArenaLoadTest must deploy only arena - arena_load_test: [applications: [arena_load_test: :permanent, arena: :permanent]], + arena_load_test: [ + applications: [arena_load_test: :permanent, arena: :permanent, bot_manager: :pemanent] + ], game_client: [applications: [game_client: :permanent]], game_backend: [ applications: [ From 474dcaad84e06d3bcbfc730d6cd9bca8b2d7cf1b Mon Sep 17 00:00:00 2001 From: agustinesco Date: Thu, 4 Apr 2024 17:27:17 -0300 Subject: [PATCH 04/10] Add bot manager env var to deploy scripts --- .github/workflows/arena-brazil-testing-deploy.yml | 5 ++++- .github/workflows/arena-europe-testing-deploy.yml | 6 ++++-- .github/workflows/loadtest-brazil-client-deploy.yml | 6 ++---- .github/workflows/loadtest-brazil-server-deploy.yml | 6 ++---- .github/workflows/loadtest-europe-client-deploy.yml | 6 ++---- .github/workflows/loadtest-europe-server-deploy.yml | 6 ++---- 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/workflows/arena-brazil-testing-deploy.yml b/.github/workflows/arena-brazil-testing-deploy.yml index 38a3bfef6..7e665fe79 100644 --- a/.github/workflows/arena-brazil-testing-deploy.yml +++ b/.github/workflows/arena-brazil-testing-deploy.yml @@ -10,6 +10,7 @@ on: - arena - arena_load_test - game_client + - bot_manager required: true jobs: @@ -58,9 +59,10 @@ jobs: PHX_SERVER: ${{ vars.PHX_SERVER }} PHX_HOST: ${{ vars.HOST }} PORT: ${{ vars.ARENA_PORT }} + BOT_MANAGER_PORT: ${{ vars.BOT_MANAGER_PORT }} DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} - NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_BRAZIL }} + NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME }} NEWRELIC_KEY: ${{ secrets.NEWRELIC_KEY }} BRANCH_NAME: ${{ github.head_ref || github.ref_name }} run: | @@ -72,6 +74,7 @@ jobs: PHX_SERVER=${PHX_SERVER} \ PHX_HOST=${PHX_HOST} \ PORT=${PORT} \ + BOT_MANAGER_PORT=${BOT_MANAGER_PORT} \ DATABASE_URL=${DATABASE_URL} \ SECRET_KEY_BASE=${SECRET_KEY_BASE} \ NEWRELIC_APP_NAME=${NEWRELIC_APP_NAME} \ diff --git a/.github/workflows/arena-europe-testing-deploy.yml b/.github/workflows/arena-europe-testing-deploy.yml index a091ad95c..2274c087b 100644 --- a/.github/workflows/arena-europe-testing-deploy.yml +++ b/.github/workflows/arena-europe-testing-deploy.yml @@ -56,11 +56,12 @@ jobs: MIX_ENV: ${{ vars.MIX_ENV }} RELEASE: ${{ inputs.release }} PHX_SERVER: ${{ vars.PHX_SERVER }} - PHX_HOST: ${{ vars.EUROPE_HOST }} + PHX_HOST: ${{ vars.HOST }} PORT: ${{ vars.ARENA_PORT }} + BOT_MANAGER_PORT: ${{ vars.BOT_MANAGER_PORT }} DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} - NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_EUROPE }} + NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME }} NEWRELIC_KEY: ${{ secrets.NEWRELIC_KEY }} BRANCH_NAME: ${{ github.head_ref || github.ref_name }} run: | @@ -72,6 +73,7 @@ jobs: PHX_SERVER=${PHX_SERVER} \ PHX_HOST=${PHX_HOST} \ PORT=${PORT} \ + BOT_MANAGER_PORT=${BOT_MANAGER_PORT} \ DATABASE_URL=${DATABASE_URL} \ SECRET_KEY_BASE=${SECRET_KEY_BASE} \ NEWRELIC_APP_NAME=${NEWRELIC_APP_NAME} \ diff --git a/.github/workflows/loadtest-brazil-client-deploy.yml b/.github/workflows/loadtest-brazil-client-deploy.yml index abde641b6..ec757ffae 100644 --- a/.github/workflows/loadtest-brazil-client-deploy.yml +++ b/.github/workflows/loadtest-brazil-client-deploy.yml @@ -62,11 +62,10 @@ jobs: MIX_ENV: ${{ vars.MIX_ENV }} RELEASE: ${{ inputs.release }} TARGET_SERVER: ${{ inputs.target_server }} - BRAZIL_HOST: ${{ vars.brazil_host }} - EUROPE_HOST: ${{ vars.europe_host }} PHX_SERVER: ${{ vars.PHX_SERVER }} PHX_HOST: ${{ vars.LOADTEST_CLIENT_HOST }} PORT: ${{ vars.ARENA_PORT }} + BOT_MANAGER_PORT: ${{ vars.BOT_MANAGER_PORT }} DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_LOADTEST }} @@ -79,11 +78,10 @@ jobs: MIX_ENV=${MIX_ENV} \ RELEASE=${RELEASE} \ TARGET_SERVER=${TARGET_SERVER} \ - BRAZIL_HOST=${BRAZIL_HOST} \ - EUROPE_HOST=${EUROPE_HOST} \ PHX_SERVER=${PHX_SERVER} \ PHX_HOST=${PHX_HOST} \ PORT=${PORT} \ + BOT_MANAGER_PORT=${BOT_MANAGER_PORT} \ DATABASE_URL=${DATABASE_URL} \ SECRET_KEY_BASE=${SECRET_KEY_BASE} \ NEWRELIC_APP_NAME=${NEWRELIC_APP_NAME} \ diff --git a/.github/workflows/loadtest-brazil-server-deploy.yml b/.github/workflows/loadtest-brazil-server-deploy.yml index c379f1621..1ddc68e92 100644 --- a/.github/workflows/loadtest-brazil-server-deploy.yml +++ b/.github/workflows/loadtest-brazil-server-deploy.yml @@ -55,11 +55,10 @@ jobs: SSH_USERNAME: ${{ vars.SSH_USERNAME }} MIX_ENV: ${{ vars.MIX_ENV }} RELEASE: ${{ inputs.release }} - BRAZIL_HOST: ${{ vars.brazil_host }} - EUROPE_HOST: ${{ vars.europe_host }} PHX_SERVER: ${{ vars.PHX_SERVER }} PHX_HOST: ${{ vars.LOADTEST_SERVER_HOST }} PORT: ${{ vars.ARENA_PORT }} + BOT_MANAGER_PORT: ${{ vars.BOT_MANAGER_PORT }} DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_LOADTEST }} @@ -71,11 +70,10 @@ jobs: BRANCH_NAME=${BRANCH_NAME} \ MIX_ENV=${MIX_ENV} \ RELEASE=${RELEASE} \ - BRAZIL_HOST=${BRAZIL_HOST} \ - EUROPE_HOST=${EUROPE_HOST} \ PHX_SERVER=${PHX_SERVER} \ PHX_HOST=${PHX_HOST} \ PORT=${PORT} \ + BOT_MANAGER_PORT=${BOT_MANAGER_PORT} \ DATABASE_URL=${DATABASE_URL} \ SECRET_KEY_BASE=${SECRET_KEY_BASE} \ NEWRELIC_APP_NAME=${NEWRELIC_APP_NAME} \ diff --git a/.github/workflows/loadtest-europe-client-deploy.yml b/.github/workflows/loadtest-europe-client-deploy.yml index 60e266373..7369fe121 100644 --- a/.github/workflows/loadtest-europe-client-deploy.yml +++ b/.github/workflows/loadtest-europe-client-deploy.yml @@ -62,11 +62,10 @@ jobs: MIX_ENV: ${{ vars.MIX_ENV }} RELEASE: ${{ inputs.release }} TARGET_SERVER: ${{ inputs.target_server }} - BRAZIL_HOST: ${{ vars.brazil_host }} - EUROPE_HOST: ${{ vars.europe_host }} PHX_SERVER: ${{ vars.PHX_SERVER }} PHX_HOST: ${{ vars.LOADTEST_CLIENT_HOST }} PORT: ${{ vars.ARENA_PORT }} + BOT_MANAGER_PORT: ${{ vars.BOT_MANAGER_PORT }} DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_LOADTEST }} @@ -79,11 +78,10 @@ jobs: MIX_ENV=${MIX_ENV} \ RELEASE=${RELEASE} \ TARGET_SERVER=${TARGET_SERVER} \ - BRAZIL_HOST=${BRAZIL_HOST} \ - EUROPE_HOST=${EUROPE_HOST} \ PHX_SERVER=${PHX_SERVER} \ PHX_HOST=${PHX_HOST} \ PORT=${PORT} \ + BOT_MANAGER_PORT=${BOT_MANAGER_PORT} \ DATABASE_URL=${DATABASE_URL} \ SECRET_KEY_BASE=${SECRET_KEY_BASE} \ NEWRELIC_APP_NAME=${NEWRELIC_APP_NAME} \ diff --git a/.github/workflows/loadtest-europe-server-deploy.yml b/.github/workflows/loadtest-europe-server-deploy.yml index a9ede95a7..645a3ba94 100644 --- a/.github/workflows/loadtest-europe-server-deploy.yml +++ b/.github/workflows/loadtest-europe-server-deploy.yml @@ -55,11 +55,10 @@ jobs: SSH_USERNAME: ${{ vars.SSH_USERNAME }} MIX_ENV: ${{ vars.MIX_ENV }} RELEASE: ${{ inputs.release }} - BRAZIL_HOST: ${{ vars.brazil_host }} - EUROPE_HOST: ${{ vars.europe_host }} PHX_SERVER: ${{ vars.PHX_SERVER }} PHX_HOST: ${{ vars.LOADTEST_SERVER_HOST }} PORT: ${{ vars.ARENA_PORT }} + BOT_MANAGER_PORT: ${{ vars.BOT_MANAGER_PORT }} DATABASE_URL: ${{ secrets.DATABASE_URL }} SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }} NEWRELIC_APP_NAME: ${{ vars.NEWRELIC_APP_NAME_LOADTEST }} @@ -71,11 +70,10 @@ jobs: BRANCH_NAME=${BRANCH_NAME} \ MIX_ENV=${MIX_ENV} \ RELEASE=${RELEASE} \ - BRAZIL_HOST=${BRAZIL_HOST} \ - EUROPE_HOST=${EUROPE_HOST} \ PHX_SERVER=${PHX_SERVER} \ PHX_HOST=${PHX_HOST} \ PORT=${PORT} \ + BOT_MANAGER_PORT=${BOT_MANAGER_PORT} \ DATABASE_URL=${DATABASE_URL} \ SECRET_KEY_BASE=${SECRET_KEY_BASE} \ NEWRELIC_APP_NAME=${NEWRELIC_APP_NAME} \ From 9b423477f7cc3ef6dcbcb8ae1aea6ad1496b6937 Mon Sep 17 00:00:00 2001 From: agustinesco Date: Thu, 4 Apr 2024 17:27:43 -0300 Subject: [PATCH 05/10] Add bot manager release option --- .github/workflows/arena-brazil-testing-deploy.yml | 1 - .github/workflows/loadtest-brazil-client-deploy.yml | 1 + .github/workflows/loadtest-europe-client-deploy.yml | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/arena-brazil-testing-deploy.yml b/.github/workflows/arena-brazil-testing-deploy.yml index 7e665fe79..1cb186728 100644 --- a/.github/workflows/arena-brazil-testing-deploy.yml +++ b/.github/workflows/arena-brazil-testing-deploy.yml @@ -10,7 +10,6 @@ on: - arena - arena_load_test - game_client - - bot_manager required: true jobs: diff --git a/.github/workflows/loadtest-brazil-client-deploy.yml b/.github/workflows/loadtest-brazil-client-deploy.yml index ec757ffae..dff7a3a14 100644 --- a/.github/workflows/loadtest-brazil-client-deploy.yml +++ b/.github/workflows/loadtest-brazil-client-deploy.yml @@ -10,6 +10,7 @@ on: - arena - arena_load_test - game_client + - bot_manager required: true target_server: type: choice diff --git a/.github/workflows/loadtest-europe-client-deploy.yml b/.github/workflows/loadtest-europe-client-deploy.yml index 7369fe121..85ae93de1 100644 --- a/.github/workflows/loadtest-europe-client-deploy.yml +++ b/.github/workflows/loadtest-europe-client-deploy.yml @@ -10,6 +10,7 @@ on: - arena - arena_load_test - game_client + - bot_manager required: true target_server: type: choice From a7f07be8d1aebb4ba41760f8a7ab4b2e6c8b50be Mon Sep 17 00:00:00 2001 From: agustinesco Date: Thu, 4 Apr 2024 17:49:39 -0300 Subject: [PATCH 06/10] Add bot manager to arena load tests application --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mix.exs b/mix.exs index 9a77cdae7..78575fcbc 100644 --- a/mix.exs +++ b/mix.exs @@ -46,7 +46,7 @@ defmodule MirraBackend.MixProject do arena: [applications: [arena: :permanent]], # TODO ArenaLoadTest must deploy only arena arena_load_test: [ - applications: [arena_load_test: :permanent, arena: :permanent, bot_manager: :pemanent] + applications: [arena_load_test: :permanent, arena: :permanent, bot_manager: :permanent] ], game_client: [applications: [game_client: :permanent]], game_backend: [ From 908bc5a2ad14e308133ef6b21d2b7f93fbacb80a Mon Sep 17 00:00:00 2001 From: agustinesco Date: Thu, 4 Apr 2024 17:49:50 -0300 Subject: [PATCH 07/10] Turn off bots --- apps/bot_manager/lib/bot_supervisor.ex | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/bot_manager/lib/bot_supervisor.ex b/apps/bot_manager/lib/bot_supervisor.ex index c0579506a..e0b26243c 100644 --- a/apps/bot_manager/lib/bot_supervisor.ex +++ b/apps/bot_manager/lib/bot_supervisor.ex @@ -13,6 +13,8 @@ defmodule BotManager.BotSupervisor do end def add_bot_to_game(bot_config) do - DynamicSupervisor.start_child(__MODULE__, {BotManager.GameSocketHandler, bot_config}) + if System.get_env("BOT_ACTIVES") == "true" do + DynamicSupervisor.start_child(__MODULE__, {BotManager.GameSocketHandler, bot_config}) + end end end From 9aeb905854f9947ffd6ed1927b328b17e6694d6f Mon Sep 17 00:00:00 2001 From: agustinesco Date: Thu, 4 Apr 2024 17:50:02 -0300 Subject: [PATCH 08/10] Add bot manager port to deploy script --- devops/deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/devops/deploy.sh b/devops/deploy.sh index 336f6e66f..ab467ab42 100755 --- a/devops/deploy.sh +++ b/devops/deploy.sh @@ -58,6 +58,7 @@ DATABASE_URL=${DATABASE_URL} PHX_SERVER=${PHX_SERVER} SECRET_KEY_BASE=${SECRET_KEY_BASE} PORT=${PORT} +BOT_MANAGER_PORT=${BOT_MANAGER_PORT} RELEASE=${RELEASE} TARGET_SERVER=${TARGET_SERVER} EUROPE_HOST=${EUROPE_HOST} From eee9c7cb3298af0a05d5ef3da372b2bd197917fa Mon Sep 17 00:00:00 2001 From: agustinesco Date: Thu, 4 Apr 2024 17:56:20 -0300 Subject: [PATCH 09/10] Rename env var --- apps/bot_manager/lib/bot_supervisor.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/bot_manager/lib/bot_supervisor.ex b/apps/bot_manager/lib/bot_supervisor.ex index e0b26243c..56ecd26d0 100644 --- a/apps/bot_manager/lib/bot_supervisor.ex +++ b/apps/bot_manager/lib/bot_supervisor.ex @@ -13,7 +13,7 @@ defmodule BotManager.BotSupervisor do end def add_bot_to_game(bot_config) do - if System.get_env("BOT_ACTIVES") == "true" do + if System.get_env("BOTS_ACTIVE") == "true" do DynamicSupervisor.start_child(__MODULE__, {BotManager.GameSocketHandler, bot_config}) end end From 2734eb9dd09edeb5e485d9541c5c0fcf8fc44f5a Mon Sep 17 00:00:00 2001 From: agustinesco Date: Thu, 4 Apr 2024 18:05:49 -0300 Subject: [PATCH 10/10] handle nil bot pid --- apps/bot_manager/lib/endpoint.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/bot_manager/lib/endpoint.ex b/apps/bot_manager/lib/endpoint.ex index 9be3a627c..519c72d94 100644 --- a/apps/bot_manager/lib/endpoint.ex +++ b/apps/bot_manager/lib/endpoint.ex @@ -26,7 +26,7 @@ defmodule BotManager.Endpoint do plug(:dispatch) get "/join/:game_id/:bot_client" do - bot_pid = BotManager.BotSupervisor.add_bot_to_game(conn.params) + bot_pid = BotManager.BotSupervisor.add_bot_to_game(conn.params) || "" conn |> put_resp_content_type("application/json")