StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: clinic.js 0kb output files

Browse source 
Something in our signal handlers/code that touched signal handlers
conflicted with clinic.js's signal handler code. With this commit,
we don't touch signal handlers at all if DEBUG mode is enabled.
This commit is contained in:
Dragory 2023-06-26 19:55:16 +00:00
parent 29a1161c05
commit b60a7fb145
No known key found for this signature in database
5 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend/src/env.ts
View file

@ -50,6 +50,11 @@ const envType = z.object({
DB_USER: z.string().optional().default("zeppelin"),
DB_PASSWORD: z.string().optional(), // Default is set to DOCKER_MYSQL_PASSWORD further below
DB_DATABASE: z.string().optional().default("zeppelin"),
DEBUG: z
.string()
.optional()
.transform((str) => str === "true"),
});
let toValidate = { ...process.env };

53
backend/src/index.ts
View file

@ -197,6 +197,10 @@ setInterval(() => {
avgCount = 0;
}, 5 * 60 * 1000);
if (env.DEBUG) {
logger.info("NOTE: Bot started in DEBUG mode");
}
logger.info("Connecting to database");
connect().then(async (connection) => {
const client = new Client({
@ -429,27 +433,30 @@ connect().then(async (connection) => {
logger.info("Logging in...");
await client.login(env.BOT_TOKEN);
let stopping = false;
const cleanupAndStop = async (code) => {
if (stopping) {
return;
}
stopping = true;
logger.info("Cleaning up before exit...");
// Force exit after 10sec
setTimeout(() => process.exit(code), 10 * SECONDS);
await bot.stop();
await connection.close();
logger.info("Done! Exiting now.");
process.exit(code);
};
process.on("beforeExit", () => cleanupAndStop(0));
process.on("SIGINT", () => {
logger.info("Received SIGINT, exiting...");
cleanupAndStop(0);
});
process.on("SIGTERM", () => {
logger.info("Received SIGTERM, exiting...");
cleanupAndStop(0);
});
// Don't intercept any signals in DEBUG mode: https://github.com/clinicjs/node-clinic/issues/444#issuecomment-1474997090
if (!env.DEBUG) {
let stopping = false;
const cleanupAndStop = async (code) => {
if (stopping) {
return;
}
stopping = true;
logger.info("Cleaning up before exit...");
// Force exit after 10sec
setTimeout(() => process.exit(code), 10 * SECONDS);
await bot.stop();
await connection.close();
logger.info("Done! Exiting now.");
process.exit(code);
};
process.on("beforeExit", () => cleanupAndStop(0));
process.on("SIGINT", () => {
logger.info("Received SIGINT, exiting...");
cleanupAndStop(0);
});
process.on("SIGTERM", () => {
logger.info("Received SIGTERM, exiting...");
cleanupAndStop(0);
});
}
});

7
backend/src/threadsSignalFix.ts
View file

@ -6,5 +6,8 @@
* - This is imported as early as possible to avoid removing our own signal handlers
*/
import "threads";
process.removeAllListeners("SIGINT");
process.removeAllListeners("SIGTERM");
import { env } from "./env";
if (!env.DEBUG) {
process.removeAllListeners("SIGINT");
process.removeAllListeners("SIGTERM");
}