Browse Source

Merge pull request 'developpement' (#16) from developpement into main

Reviewed-on: #16
fix/clean
astria 3 months ago
parent
commit
1c6308b435
  1. 2
      backend/app/controllers/media.controller.js
  2. 25
      backend/app/utils/database.js
  3. 2
      backend/server.js

2
backend/app/controllers/media.controller.js

@ -20,7 +20,7 @@ export async function getProfilePicture(req, res) {
console.log('__dirname:', __dirname); console.log('__dirname:', __dirname);
// Try the most likely path first (based on your volume mapping) // 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 { try {
res.sendFile(filePath, (err) => { res.sendFile(filePath, (err) => {

25
backend/app/utils/database.js

@ -1,19 +1,20 @@
import pg from "pg"; import pg from "pg";
export async function getClient() {
// Create a connection pool instead of individual connections // Create a connection pool instead of individual connections
const pool = new pg.Pool({ const pool = new pg.Pool({
user: process.env.POSTGRES_USER, user: process.env.POSTGRES_USER,
password: process.env.POSTGRES_PASSWORD, password: process.env.POSTGRES_PASSWORD,
host: process.env.POSTGRES_HOST, host: process.env.POSTGRES_HOST,
database: process.env.POSTGRES_DB, database: process.env.POSTGRES_DB,
port: 5432, port: 5432,
max: 30, // Increased maximum number of connections in the pool max: 30, // Increased maximum number of connections in the pool
idleTimeoutMillis: 30000, // Close idle connections after 30 seconds idleTimeoutMillis: 30000, // Close idle connections after 30 seconds
connectionTimeoutMillis: 10000, // Increased timeout to 10 seconds connectionTimeoutMillis: 10000, // Increased timeout to 10 seconds
acquireTimeoutMillis: 10000, // Wait up to 10 seconds for a connection acquireTimeoutMillis: 10000, // Wait up to 10 seconds for a connection
}); });
export async function getClient() {
// Use pool.connect() instead of creating new clients // Use pool.connect() instead of creating new clients
return await pool.connect(); return await pool.connect();
} }

2
backend/server.js

@ -91,7 +91,7 @@ app.use("/api/media", MediaRoutes);
app.use("/api/search", SearchRoute); app.use("/api/search", SearchRoute);
app.use("/api/oauth", OAuthRoute); app.use("/api/oauth", OAuthRoute);
const port = process.env.PORT; const port = process.env.BACKEND_PORT;
if (process.env.NODE_ENV !== "test") { if (process.env.NODE_ENV !== "test") {
const server = http.createServer(app); const server = http.createServer(app);

Loading…
Cancel
Save