From a662087197b44678822d599d3a5fa85161f57363 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 18 Feb 2024 10:26:30 +0100 Subject: [PATCH] logging --- src/controllers/paymentController.ts | 2 +- src/controllers/usersController.ts | 2 -- src/database/database.ts | 32 ---------------------------- src/rabbitmq/rabbitmq.ts | 7 +++--- 4 files changed, 5 insertions(+), 38 deletions(-) diff --git a/src/controllers/paymentController.ts b/src/controllers/paymentController.ts index 770254f..ff806b6 100644 --- a/src/controllers/paymentController.ts +++ b/src/controllers/paymentController.ts @@ -190,7 +190,7 @@ export async function CheckoutCanceled(req: Request, res: Response) { }); if (userPendingPayment === null) { - console.log("CheckoutCanceled not found"); + logger.error("CheckoutCanceled: user pending payment not found"); return res.status(400).send({ err: "invalid request" }); } diff --git a/src/controllers/usersController.ts b/src/controllers/usersController.ts index edb6018..23ed9c4 100644 --- a/src/controllers/usersController.ts +++ b/src/controllers/usersController.ts @@ -114,8 +114,6 @@ export async function AddEmployee(req: Request, res: Response) { if (email !== undefined && email.length > 0) { email = email.toLowerCase(); - console.log("email", email); - if (!(await isEmailValid(email))) { return res.status(400).send({ err: "invalid request" }); } diff --git a/src/database/database.ts b/src/database/database.ts index bcf7ba7..8173431 100644 --- a/src/database/database.ts +++ b/src/database/database.ts @@ -26,35 +26,3 @@ sequelize }); export default sequelize; - -/* -export let sequelize: Sequelize; - -export function initDatabase() { - sequelize = new Sequelize( - process.env.MARIADB_DATABASE as string, - process.env.MARIADB_USER as string, - process.env.MARIADB_PASSWORD as string, - { - host: process.env.MARIADB_HOST as string, - port: Number(process.env.MARIADB_PORT), - dialect: "mariadb", - } - ); - - sequelize - .authenticate() - .then(() => { - logger.info("Connection has been established successfully."); - }) - .catch((err: Error) => { - console.error("Unable to connect to the database:", err); - }); -} - -export function syncDatabase() { - sequelize.sync({ force: true }).then(() => { - console.log(`Database & tables created!`); - }); -} - */ diff --git a/src/rabbitmq/rabbitmq.ts b/src/rabbitmq/rabbitmq.ts index 0cb8878..611f8d1 100644 --- a/src/rabbitmq/rabbitmq.ts +++ b/src/rabbitmq/rabbitmq.ts @@ -1,4 +1,5 @@ import amqplib from "amqplib"; +import logger from "../logger/logger"; let channel: amqplib.Channel; @@ -13,14 +14,14 @@ async function connect( ); if (!open) { - console.log("⚡️[RabbitMQ]: connection failed"); + logger.error("⚡️[RabbitMQ]: connection failed"); return; } channel = await open.createChannel(); if (!channel) { - console.log("⚡️[RabbitMQ]: channel failed"); + logger.error("⚡️[RabbitMQ]: channel not available"); return; } } @@ -32,7 +33,7 @@ async function sendEmail( bodyData: any ) { if (!channel) { - console.log("⚡️[RabbitMQ]: channel not available"); + logger.error("⚡️[RabbitMQ]: channel not available"); return; }