From 68255ef83d42b90a6c6ae352c426139846a7e85a Mon Sep 17 00:00:00 2001 From: astria Date: Sat, 6 Sep 2025 15:44:43 +0200 Subject: [PATCH] HOTFIXES 2 --- backend/app/controllers/media.controller.js | 2 +- backend/app/utils/database.js | 25 +++++++++++---------- backend/server.js | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/backend/app/controllers/media.controller.js b/backend/app/controllers/media.controller.js index 8a1db6e..ae047aa 100644 --- a/backend/app/controllers/media.controller.js +++ b/backend/app/controllers/media.controller.js @@ -20,7 +20,7 @@ export async function getProfilePicture(req, res) { console.log('__dirname:', __dirname); // Try the most likely path first (based on your volume mapping) - const filePath = path.join('/app/app/uploads/profiles', file); + const filePath = path.join(__dirname, '../../uploads/profiles', file); try { res.sendFile(filePath, (err) => { diff --git a/backend/app/utils/database.js b/backend/app/utils/database.js index 9e66295..35260bf 100644 --- a/backend/app/utils/database.js +++ b/backend/app/utils/database.js @@ -1,19 +1,20 @@ import pg from "pg"; +export async function getClient() { // Create a connection pool instead of individual connections -const pool = new pg.Pool({ - user: process.env.POSTGRES_USER, - password: process.env.POSTGRES_PASSWORD, - host: process.env.POSTGRES_HOST, - database: process.env.POSTGRES_DB, - port: 5432, - max: 30, // Increased maximum number of connections in the pool - idleTimeoutMillis: 30000, // Close idle connections after 30 seconds - connectionTimeoutMillis: 10000, // Increased timeout to 10 seconds - acquireTimeoutMillis: 10000, // Wait up to 10 seconds for a connection -}); + const pool = new pg.Pool({ + user: process.env.POSTGRES_USER, + password: process.env.POSTGRES_PASSWORD, + host: process.env.POSTGRES_HOST, + database: process.env.POSTGRES_DB, + port: 5432, + max: 30, // Increased maximum number of connections in the pool + idleTimeoutMillis: 30000, // Close idle connections after 30 seconds + connectionTimeoutMillis: 10000, // Increased timeout to 10 seconds + acquireTimeoutMillis: 10000, // Wait up to 10 seconds for a connection + }); + -export async function getClient() { // Use pool.connect() instead of creating new clients return await pool.connect(); } diff --git a/backend/server.js b/backend/server.js index ab22864..b01631f 100644 --- a/backend/server.js +++ b/backend/server.js @@ -91,7 +91,7 @@ app.use("/api/media", MediaRoutes); app.use("/api/search", SearchRoute); app.use("/api/oauth", OAuthRoute); -const port = process.env.PORT; +const port = process.env.BACKEND_PORT; if (process.env.NODE_ENV !== "test") { const server = http.createServer(app);