From dd0f5f9534b8649ca00991afdce5220d9996b066 Mon Sep 17 00:00:00 2001 From: Gabriel Matte Date: Mon, 9 Dec 2024 22:17:27 -0500 Subject: [PATCH] fix dns issue stress-test --- .gitignore | 1 + test/stressTest/.env.example | 2 -- test/stressTest/docker-compose.yml | 19 ++++++++++++++----- test/stressTest/main.js | 2 +- test/stressTest/utility/apiServices.js | 19 +++++++++++-------- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index c2616e7..67aa61c 100644 --- a/.gitignore +++ b/.gitignore @@ -130,6 +130,7 @@ dist .pnp.* db-backup/ +.env .venv deployments /test/stressTest/output diff --git a/test/stressTest/.env.example b/test/stressTest/.env.example index 254f2d4..0c1763b 100644 --- a/test/stressTest/.env.example +++ b/test/stressTest/.env.example @@ -10,8 +10,6 @@ NUMBER_ROOMS=5 USERS_PER_ROOM=60 # Optionnal - - MAX_MESSAGES_ROUND=20 CONVERSATION_INTERVAL=1000 MESSAGE_RESPONSE_TIMEOUT=5000 diff --git a/test/stressTest/docker-compose.yml b/test/stressTest/docker-compose.yml index 51f4707..142d9e1 100644 --- a/test/stressTest/docker-compose.yml +++ b/test/stressTest/docker-compose.yml @@ -8,9 +8,18 @@ services: dockerfile: Dockerfile container_name: stress-test network_mode: host - env_file: - - .env + #environment: + # - BASE_URL=http://127.0.0.1 + # - USER_EMAIL=admin@admin.com + # - USER_PASSWORD=admin + # - NUMBER_ROOMS=5 + # - USERS_PER_ROOM=60 + # - MAX_MESSAGES_ROUND=20 + # - CONVERSATION_INTERVAL=1000 + # - MESSAGE_RESPONSE_TIMEOUT=5000 + # - BATCH_DELAY=1000 + # - BATCH_SIZE=10 + #env_file: + # - .env volumes: - - ./output:/app/output - tty: true - stdin_open: true \ No newline at end of file + - ./output:/app/output \ No newline at end of file diff --git a/test/stressTest/main.js b/test/stressTest/main.js index e7a06cd..63cbe9f 100644 --- a/test/stressTest/main.js +++ b/test/stressTest/main.js @@ -9,7 +9,7 @@ import generateMetricsReport from './utility/metrics_generator.js'; dotenv.config(); const config = { - baseUrl: process.env.BASE_URL || 'http://localhost', + baseUrl: process.env.BASE_URL || 'http://127.0.0.1', auth: { username: process.env.USER_EMAIL || 'admin@admin.com', password: process.env.USER_PASSWORD || 'admin' diff --git a/test/stressTest/utility/apiServices.js b/test/stressTest/utility/apiServices.js index 36d8472..d3e66ae 100644 --- a/test/stressTest/utility/apiServices.js +++ b/test/stressTest/utility/apiServices.js @@ -42,17 +42,20 @@ async function register(baseUrl, email, password) { // Attempts to log in a user, or registers and logs in if the login fails. export async function attemptLoginOrRegister(baseUrl, username, password) { + console.log(`Authenticating user with server : ${baseUrl}, username: ${username}, password: ${password}`); try { return await login(baseUrl, username, password); } catch (loginError) { - console.log(`Login failed for ${username}. Attempting registration...`); - try { - await register(baseUrl, username, password); - return await login(baseUrl, username, password); - } catch (registerError) { - console.error(`Registration and login failed for ${username}:`, registerError.message); - return null; - } + console.error(`Login failed for ${username}:`, loginError.message); + } + + console.log(`Login failed for ${username}. Attempting registration...`); + try { + await register(baseUrl, username, password); + return await login(baseUrl, username, password); + } catch (registerError) { + console.error(`Registration and login failed for ${username}:`, registerError.message); + return null; } }