diff --git a/.env b/.env index 94abc32a8429ab44237627fd35bfcc44b258ab28..8ef5f4b25961a01622ca8222feedd1ff6f72db0b 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ -DB_HOST=10.104.14.140 +DB_HOST=localhost DB_USER=root -DB_PASS=ABQics23136 +DB_PASS= DB_NAME=mypocketapp SESSION_SECRET=your_secret_key diff --git a/db.js b/db.js index 3eb691eef165273c23ab7f86dd3a9ebdfa4c5444..4958f9099d0f11a22760aec765cf63f54cbf59dc 100644 --- a/db.js +++ b/db.js @@ -1,14 +1,44 @@ -const mysql = require('mysql2'); -require('dotenv').config(); +// const mysql = require("mysql2"); +// require("dotenv").config(); + +// const pool = mysql.createPool({ +// host: process.env.DB_HOST || "localhost", +// user: process.env.DB_USER || "root", +// password: process.env.DB_PASS || "", +// database: process.env.DB_NAME || "mypocketapp", +// port: process.env.DB_PORT || 3306, +// }); + +// pool.getConnection((err) => { +// if (err) { +// console.error("❌ Database connection failed:", err); +// return; +// } +// console.log("✅ MySQL Connected..."); +// }); + +// module.exports = pool; + +const mysql = require("mysql2/promise"); +require("dotenv").config(); const pool = mysql.createPool({ - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASS, - database: process.env.DB_NAME, - waitForConnections: true, - connectionLimit: 10, - queueLimit: 0 -}).promise(); - -module.exports = pool; + host: process.env.DB_HOST || "localhost", + user: process.env.DB_USER || "root", + password: process.env.DB_PASS || "", + database: process.env.DB_NAME || "mypocketapp", + port: process.env.DB_PORT || 3306, +}); + +// Test the database connection +(async () => { + try { + const connection = await pool.getConnection(); + console.log("✅ MySQL Connected..."); + connection.release(); // Release the connection back to the pool + } catch (err) { + console.error("❌ Database connection failed:", err); + } +})(); + +module.exports = pool; \ No newline at end of file