PEER-220: Try fix sleep bug

Signed-off-by: SeeuSim <[email protected]>

Author: SeeuSim

backend/matching/src/index.ts

@@ -16,7 +16,7 @@ server.listen(port, () => {
 });
 
 const shutdown = async () => {
-  await Promise.all(workers.map((worker) => worker.kill('SIGTERM')));
+  await Promise.all(workers.map((worker) => worker.kill()));
   server.close(() => {
     logger.info('App shut down');
   });

backend/matching/src/workers/cleaner.ts

@@ -8,12 +8,25 @@ const logger = {
   error: (message: unknown) => process.send && process.send(message),
 };
 
-process.on('SIGTERM', () => {
+const sleepTime = 5000;
+let stopSignal = false;
+let timeout: ReturnType<typeof setTimeout>;
+
+const cancel = () => {
+  stopSignal = true;
+  clearTimeout(timeout);
+};
+const shutdown = () => {
+  cancel();
   client
     .disconnect()
     .then(() => client.quit())
     .then(process.exit(0));
-});
+};
+
+process.on('SIGINT', shutdown);
+process.on('SIGHUP', shutdown);
+process.on('SIGTERM', shutdown);
 
 async function clean() {
   const redisClient = client.isReady || client.isOpen ? client : await client.connect();
@@ -27,7 +40,7 @@ async function clean() {
 
   if (!response || response.messages.length === 0) {
     await new Promise((resolve, _reject) => {
-      setTimeout(() => resolve('Next Loop'), 5000);
+      timeout = setTimeout(() => resolve('Next Loop'), sleepTime);
     });
     return;
   }
@@ -55,6 +68,10 @@ async function clean() {
 }
 
 (function loop() {
+  if (stopSignal) {
+    return;
+  }
+
   Promise.resolve()
     .then(async () => await clean())
     .catch((err) => {

backend/matching/src/workers/matcher.ts

@@ -9,12 +9,24 @@ const logger = {
   error: (message: unknown) => process.send && process.send(message),
 };
 
-process.on('SIGTERM', () => {
+const sleepTime = 5000;
+let stopSignal = false;
+let timeout: ReturnType<typeof setTimeout>;
+const cancel = () => {
+  stopSignal = true;
+  clearTimeout(timeout);
+};
+const shutdown = () => {
+  cancel();
   client
     .disconnect()
     .then(() => client.quit())
     .then(process.exit(0));
-});
+};
+
+process.on('SIGINT', shutdown);
+process.on('SIGHUP', shutdown);
+process.on('SIGTERM', shutdown);
 
 type RequestorParams = {
   requestorUserId: string;
@@ -76,7 +88,7 @@ async function match() {
   );
   if (!stream || stream.length === 0) {
     await new Promise((resolve, _reject) => {
-      setTimeout(() => resolve('Next Loop'), 5000);
+      timeout = setTimeout(() => resolve('Next Loop'), sleepTime);
     });
     return;
   }
@@ -160,6 +172,10 @@ async function match() {
 }
 
 (function loop() {
+  if (stopSignal) {
+    return;
+  }
+
   Promise.resolve()
     .then(async () => await match())
     .catch((error) => {