From 9b9d71998b7803760ea8c4342f78994bf4c190ec Mon Sep 17 00:00:00 2001 From: Trivernis Date: Sat, 16 Nov 2019 15:03:34 +0100 Subject: [PATCH] Fixed seqelize logging without winston --- src/app.ts | 1 + src/index.ts | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app.ts b/src/app.ts index f766b2c..c21518a 100644 --- a/src/app.ts +++ b/src/app.ts @@ -59,6 +59,7 @@ class App { const force = fsx.existsSync("sqz-force"); logger.info(`Syncinc database. Sequelize Table force: ${force}.`); await this.sequelize.sync({force, logging: (msg) => logger.silly(msg)}); + this.sequelize.options.logging = (msg) => logger.silly(msg); logger.info("Setting up socket.io"); await routes.ioListeners(this.io); this.io.adapter(socketIoRedis()); diff --git a/src/index.ts b/src/index.ts index 3b37e39..96c7c0d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -31,22 +31,23 @@ if (cluster.isMaster) { }, 1000); const log = (msg: string) => { - process.stdout.write(" ".padEnd(50) + "\r"); + process.stdout.write(" ".padEnd(100) + "\r"); process.stdout.write(msg); process.stdout.write( - `[C] W: ${clusterData.workerCount()}, Rq: ${clusterData.reqCount}, Mem: ${(() => { + `W: ${clusterData.workerCount()},R: ${clusterData.reqCount},M: ${(() => { let usageString = ""; for (const [key, value] of Object.entries(clusterData.workerRes)) { - usageString += `[${key}] ${ - Math.round((value as IResourceUsage).mem.heapUsed / 10000) / 100}MB,`.padEnd(13); + usageString += `${ + Math.round((value as IResourceUsage).mem.heapUsed / 100000) / 10}MB,`.padEnd(8); } return usageString; - })()}`.padEnd(49) + "\r"); + })()}`.padEnd(99) + "\r"); }; cluster.settings.silent = true; cluster.on("exit", (worker, code, signal) => { log(`[CLUSTER-M] Worker ${worker.process.pid} died!\n`); + delete clusterData.workerRes[worker.id]; log("[CLUSTER-M] Starting new worker\n"); cluster.fork(); });