fix: refactor database connection configuration to use baseConfig
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
const { Pool } = require('pg');
|
const { Pool } = require('pg');
|
||||||
|
|
||||||
const pool = new Pool({
|
const baseConfig = {
|
||||||
user: process.env.DB_USER,
|
user: process.env.DB_USER,
|
||||||
password: process.env.DB_PSW,
|
password: process.env.DB_PSW,
|
||||||
host: process.env.DB_HOST,
|
host: process.env.DB_HOST,
|
||||||
@@ -8,20 +8,17 @@ const pool = new Pool({
|
|||||||
max: 10,
|
max: 10,
|
||||||
idleTimeoutMillis: 30000,
|
idleTimeoutMillis: 30000,
|
||||||
connectionTimeoutMillis: 5000,
|
connectionTimeoutMillis: 5000,
|
||||||
})
|
};
|
||||||
|
|
||||||
const dbs = {
|
const dbs = {
|
||||||
data: { name: process.env.DATA_DB },
|
data: { name: process.env.DATA_DB },
|
||||||
sensors: { name: process.env.SENSORS_DB }
|
sensors: { name: process.env.SENSORS_DB }
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('DB_PSW type:', typeof process.env.DB_PSW, 'value:', process.env.DB_PSW);
|
|
||||||
console.log('Pool password type:', typeof pool.options.password, 'value:', pool.options.password);
|
|
||||||
|
|
||||||
function getPool(db) {
|
function getPool(db) {
|
||||||
const dbConfig = dbs[db];
|
const dbConfig = dbs[db];
|
||||||
if (!dbConfig) throw new Error(`Database ${db} not configured`);
|
if (!dbConfig) throw new Error(`Database ${db} not configured`);
|
||||||
return new Pool({ ...pool.options, database: dbConfig.name });
|
return new Pool({ ...baseConfig, database: dbConfig.name });
|
||||||
}
|
}
|
||||||
|
|
||||||
async function checkConnection(db) {
|
async function checkConnection(db) {
|
||||||
|
|||||||
Reference in New Issue
Block a user