@yolo-croket-dev/core 1.4.53-slowquery.8 → 1.4.53

package/interceptors/rpc.interceptor.js

@@ -149,9 +149,11 @@ let RPCInterceptor = class RPCInterceptor {
         const reDeliveryCount = Number(message.properties.headers['x-delivery-count']) || 0; /** 몇번 재전달되었는지 */
         const staticRetryCount = Number(options === null || options === void 0 ? void 0 : options.messageRetryCount) || 0; /** 최대 재시도 갯수 */
         const method = content.pattern;
+        const correlationId = message.properties.correlationId;
         const execInterceptor = {
             method,
             traceId: ((_a = content.data.param) === null || _a === void 0 ? void 0 : _a.traceId) || '-',
+            correlationId,
         };
         // const logParam = {
         //   traceId,

package/modules/graceful-shutdown/graceful-shutdown.service.d.ts

@@ -2,6 +2,7 @@ import { OnApplicationShutdown, OnModuleDestroy, OnApplicationBootstrap } from '
 interface GracefulExecInterceptor {
     method: string;
     traceId?: string;
+    correlationId: string;
 }
 export declare class GracefulShutdownService implements OnApplicationShutdown, OnModuleDestroy, OnApplicationBootstrap {
     private activeInterceptors;

package/modules/graceful-shutdown/graceful-shutdown.service.js

@@ -46,10 +46,9 @@ let GracefulShutdownService = class GracefulShutdownService {
     }
     popActiveInterceptors(execInterceptor) {
         // eslint-disable-next-line max-len
-        this.activeInterceptors = this.activeInterceptors.filter((item) => item.method === execInterceptor.method && item.traceId === execInterceptor.traceId);
+        this.activeInterceptors = this.activeInterceptors.filter((item) => !(item.method === execInterceptor.method && item.traceId === execInterceptor.traceId && item.correlationId === execInterceptor.correlationId));
     }
     async onApplicationShutdown(signal) {
-        console.debug(`GracefulShutdownService.onApplicationShutdown signal=${signal}`, { traceId: 'ON_APPLICATION_SHUTDOWN' });
         msaLogger.debug(`GracefulShutdownService.onApplicationShutdown signal=${signal}`, { traceId: 'ON_APPLICATION_SHUTDOWN' });
         process.exit(0);
     }
@@ -58,16 +57,17 @@ let GracefulShutdownService = class GracefulShutdownService {
         msaLogger.debug('GracefulShutdownService.onModuleDestroy', { traceId: 'ON_MODULE_DESTROY' });
         // eslint-disable-next-line max-len
         msaLogger.debug('GracefulShutdownService.onModuleDestroy activeInterceptors', { traceId: 'ON_MODULE_DESTROY' }, { activeInterceptors: this.activeInterceptors });
-        // eslint-disable-next-line max-len
-        console.debug('GracefulShutdownService.onModuleDestroy activeInterceptors', { traceId: 'ON_MODULE_DESTROY' }, { activeInterceptors: this.activeInterceptors });
         let prevExecInterceptorCount = 0;
+        let count = 0;
         while (this.activeInterceptors.length) {
-            if (prevExecInterceptorCount !== this.activeInterceptors.length) {
+            count += 1;
+            if ((prevExecInterceptorCount !== this.activeInterceptors.length) || (count % 100 === 0)) {
                 prevExecInterceptorCount = this.activeInterceptors.length;
                 // eslint-disable-next-line max-len
-                console.log(`GracefulShutdownService.onModuleDestroy: waiting for ${this.activeInterceptors} interceptors to finish`, { traceId: 'ON_MODULE_DESTROY' }, { activeInterceptors: this.activeInterceptors });
-                // eslint-disable-next-line max-len
-                msaLogger.debug(`GracefulShutdownService.onModuleDestroy: waiting for ${this.activeInterceptors} interceptors to finish`, { traceId: 'ON_MODULE_DESTROY' }, { activeInterceptors: this.activeInterceptors });
+                msaLogger.debug('GracefulShutdownService.onModuleDestroy: waiting for interceptors to finish', { traceId: 'ON_MODULE_DESTROY' }, {
+                    activeInterceptors: this.activeInterceptors,
+                    count,
+                });
             }
             await new Promise((resolve) => {
                 setTimeout(resolve, 1000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yolo-croket-dev/core",
-  "version": "1.4.53-slowquery.8",
+  "version": "1.4.53",
   "author": "Yolo Co., Ltd.",
   "description": "Yolo commonization module",
   "main": "index.js",