From e4f8b3dc905fa43b35ce232ce5917c04f3b224ca Mon Sep 17 00:00:00 2001 From: Junior Date: Sat, 7 Oct 2023 00:52:03 -0300 Subject: [PATCH] - Changed package bcrypt to bcryptjs - Log memory usage every 10 minutes --- .../launcher_update/launcher_info.ini | 2 +- src/app.js | 21 +++++++++++++++++++ src/routes/auth.js | 2 +- src/routes/launcher/changePassword.js | 2 +- src/routes/launcher/login.js | 2 +- src/routes/launcher/register.js | 2 +- 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/public/launcher/launcher_update/launcher_info.ini b/public/launcher/launcher_update/launcher_info.ini index 7d52452..6e221b7 100644 --- a/public/launcher/launcher_update/launcher_info.ini +++ b/public/launcher/launcher_update/launcher_info.ini @@ -1,2 +1,2 @@ [LAUNCHER] -version=1.0.0 \ No newline at end of file +version=1.1.0 \ No newline at end of file diff --git a/src/app.js b/src/app.js index 55910a3..a68aa3f 100644 --- a/src/app.js +++ b/src/app.js @@ -134,6 +134,27 @@ console.log(` External: ${formatBytes(memoryUsage.external)}`); console.log(` Array Buffers: ${formatBytes(memoryUsage.arrayBuffers)}`); console.log('--------------------------------------------------'); +// Function to log memory usage +function logMemoryUsage() { + const now = new Date(); + const formattedDateTime = moment(now).format('YYYY-MM-DD HH:mm:ss'); + + const memoryUsage = process.memoryUsage(); + + console.log(`Memory Usage at ${formattedDateTime}:`); + console.log(` RSS : ${formatBytes(memoryUsage.rss)}`); + console.log(` Heap Total : ${formatBytes(memoryUsage.heapTotal)}`); + console.log(` Heap Used : ${formatBytes(memoryUsage.heapUsed)}`); + console.log(` External : ${formatBytes(memoryUsage.external)}`); + console.log(` Array Buffers: ${formatBytes(memoryUsage.arrayBuffers)}`); + console.log('--------------------------------------------------'); +} + +// Log memory usage every 10 minutes (600000 milliseconds) +const memoryLogInterval = 600000; + +setInterval(logMemoryUsage, memoryLogInterval); + app.listen(port, publicIP, () => { logger.info(`API listening on ${publicIP}:${port}`); logger.info(`Auth API listening on 127.0.0.1:${authPort}`); diff --git a/src/routes/auth.js b/src/routes/auth.js index 45422df..585cc5e 100644 --- a/src/routes/auth.js +++ b/src/routes/auth.js @@ -1,5 +1,5 @@ const express = require('express'); -const bcrypt = require('bcrypt'); +const bcrypt = require('bcryptjs'); const xml2js = require('xml2js'); const sql = require('mssql'); const Joi = require('joi'); diff --git a/src/routes/launcher/changePassword.js b/src/routes/launcher/changePassword.js index 8ee8a51..9a58ea6 100644 --- a/src/routes/launcher/changePassword.js +++ b/src/routes/launcher/changePassword.js @@ -1,7 +1,7 @@ const sql = require('mssql'); const express = require('express'); const router = express.Router(); -const bcrypt = require('bcrypt'); +const bcrypt = require('bcryptjs'); const crypto = require('crypto'); const { logger, accountLogger } = require('../../utils/logger'); const { sendPasswordChangedEmail } = require('../../mailer/mailer'); diff --git a/src/routes/launcher/login.js b/src/routes/launcher/login.js index da83906..4b31cad 100644 --- a/src/routes/launcher/login.js +++ b/src/routes/launcher/login.js @@ -1,5 +1,5 @@ const sql = require('mssql'); -const bcrypt = require('bcrypt'); +const bcrypt = require('bcryptjs'); const crypto = require('crypto'); const express = require('express'); const router = express.Router(); diff --git a/src/routes/launcher/register.js b/src/routes/launcher/register.js index 57ebcb9..ace6503 100644 --- a/src/routes/launcher/register.js +++ b/src/routes/launcher/register.js @@ -1,7 +1,7 @@ const sql = require('mssql'); const express = require('express'); const router = express.Router(); -const bcrypt = require('bcrypt'); +const bcrypt = require('bcryptjs'); const crypto = require('crypto'); const { logger, accountLogger } = require('../../utils/logger'); const { sendConfirmationEmail } = require('../../mailer/mailer');