Browse Source

Merge pull request 'HOTFIXES 2' (#15) from features/loading into developpement

Reviewed-on: #15
developpement
astria 3 months ago
parent
commit
ace7d9afc0
  1. 2
      backend/app/controllers/media.controller.js
  2. 3
      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) => {

3
backend/app/utils/database.js

@ -1,5 +1,6 @@
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,
@ -13,7 +14,7 @@ const pool = new pg.Pool({
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