From 3117750b106c2ccc7062887cb4c87a89caae1e0e Mon Sep 17 00:00:00 2001 From: Luke Berndt Date: Fri, 13 Sep 2024 14:14:30 -0400 Subject: [PATCH] more connections --- backend/index.js | 18 ++++++++++++++---- docker-compose.yml | 14 ++++++++++++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/backend/index.js b/backend/index.js index f1c49ad..801f0a8 100644 --- a/backend/index.js +++ b/backend/index.js @@ -43,9 +43,19 @@ configureExpress(app) // ------------------------------------------- -var host = process.env['MONGO_NODE_DRIVER_HOST'] != null ? process.env['MONGO_NODE_DRIVER_HOST'] : 'mongo'; -var port = process.env['MONGO_NODE_DRIVER_PORT'] != null ? process.env['MONGO_NODE_DRIVER_PORT'] : 27017; -var mongoUrl = 'mongodb://' + host + ':' + port + '/scanner'; +const mongo_host = process.env['MONGO_HOST'] != null ? process.env['MONGO_HOST'] : 'mongo'; +const mongo_port = process.env['MONGO_PORT'] != null ? process.env['MONGO_PORT'] : 27017; +const mongo_user = process.env['MONGO_USER']; +const mongo_password = process.env['MONGO_PASSWORD']; + +let mongoUrl; + +if ((typeof mongo_user !== 'undefined') && (typeof mongo_password !== 'undefined')) { + console.log("Using authentication for MongoDB - user: " + mongo_user); + mongoUrl = 'mongodb://' + mongo_user + ':' + mongo_password + '@' + mongo_host + ':' + mongo_port + '/scanner'; +} else { + mongoUrl = 'mongodb://' + mongo_host + ':' + mongo_port + '/scanner'; +} const connect = async () => { @@ -61,7 +71,7 @@ const connect = async () => { console.log('Mongoose is disconnecting'); }); - await mongoose.connect(mongoUrl, { useNewUrlParser: true, useUnifiedTopology: true, maxPoolSize: 25 }); + await mongoose.connect(mongoUrl, { useNewUrlParser: true, useUnifiedTopology: true, maxPoolSize: 50 }); console.log("All Done"); } connect(); diff --git a/docker-compose.yml b/docker-compose.yml index 7b26ff4..4b35300 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,6 +68,10 @@ services: - OTEL_EXPORTER_OTLP_HEADERS - OTEL_SERVICE_NAME - MONGO_NODE_DRIVER_HOST=mongo + - MONGO_HOST + - MONGO_PORT + - MONGO_USER + - MONGO_PASSWORD - MAILJET_KEY - MAILJET_SECRET - REACT_APP_ADMIN_EMAIL @@ -117,7 +121,10 @@ services: - REACT_APP_ACCOUNT_SERVER - REACT_APP_FRONTEND_SERVER - REACT_APP_SITE_NAME - - MONGO_NODE_DRIVER_HOST=mongo + - MONGO_HOST + - MONGO_PORT + - MONGO_USER + - MONGO_PASSWORD - NODE_ENV depends_on: - mongo @@ -143,7 +150,10 @@ services: - NODE_ENV image: "acount:${TAG}-${STAGE}" environment: - - MONGO_NODE_DRIVER_HOST=mongo + - MONGO_HOST + - MONGO_PORT + - MONGO_USER + - MONGO_PASSWORD - MAILJET_KEY - MAILJET_SECRET - REACT_APP_BACKEND_SERVER