@yolo-croket-dev/core 1.4.53-slowquery.2 → 1.4.53-slowquery.4

package/interceptors/rpc.interceptor.js

@@ -1,10 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -15,10 +38,13 @@ const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const msa_logger_1 = __importStar(require("@yolo-croket-dev/msa-logger"));
 // import Logger from '@yolo-croket-dev/logger';
 const functions_1 = require("../functions");
 const exceptions_1 = require("../exceptions");
 const graceful_shutdown_service_1 = require("../modules/graceful-shutdown/graceful-shutdown.service");
+// const logger = Logger.createLogger('RPCInterceptor');
+const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
 // const MAX_CUT_LENGTH = 500;
 const MAX_LENGTH = 300;
 let RPCInterceptor = class RPCInterceptor {
@@ -127,6 +153,12 @@ let RPCInterceptor = class RPCInterceptor {
         //   traceId,
         //   method,
         // };
+        /** consume 메시지 전부 cancel */
+        if (this.gracefulShutdownService.isApplicationExit) {
+            msaLogger.debug('RPCInterceptor isApplicationExit called', { traceId: 'IS_APPLICATION_EXIT' });
+            channel.cancel(message.fields.consumerTag);
+            return new rxjs_1.Observable();
+        }
         if (!staticRetryCount && reDeliveryCount > 0) {
             channel.sendToQueue(message.properties.replyTo, Buffer.from(JSON.stringify({
                 isError: true,
@@ -234,6 +266,7 @@ let RPCInterceptor = class RPCInterceptor {
         else {
             // logger.debug(`=> (${traceId}): ${JSON.stringify(this.keyCutter(JSON.stringify(content)))}`);
         }
+        msaLogger.debug('RPCInterceptor IncActiveInterceptors called', { traceId: 'INC_RPC_ACTIVE_INTERCEPTORS' });
         this.gracefulShutdownService.incActiveInterceptors();
         // eslint-disable-next-line consistent-return
         return next
@@ -258,6 +291,7 @@ let RPCInterceptor = class RPCInterceptor {
             },
             error: localErrorProcessor,
         }), (0, operators_1.finalize)(() => {
+            msaLogger.debug('RPCInterceptor DecActiveInterceptors called', { traceId: 'DEC_RPC_ACTIVE_INTERCEPTORS' });
             this.gracefulShutdownService.decActiveInterceptors();
         }));
     }

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

@@ -1,6 +1,8 @@
-import { OnApplicationShutdown, OnModuleDestroy } from '@nestjs/common';
-export declare class GracefulShutdownService implements OnApplicationShutdown, OnModuleDestroy {
+import { OnApplicationShutdown, OnModuleDestroy, OnApplicationBootstrap } from '@nestjs/common';
+export declare class GracefulShutdownService implements OnApplicationShutdown, OnModuleDestroy, OnApplicationBootstrap {
     private activeInterceptors;
+    isApplicationExit: boolean;
+    onApplicationBootstrap(): void;
     incActiveInterceptors(): void;
     decActiveInterceptors(): void;
     onApplicationShutdown(signal?: string): Promise<void>;

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

@@ -36,6 +36,11 @@ const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
 let GracefulShutdownService = class GracefulShutdownService {
     constructor() {
         this.activeInterceptors = 0;
+        this.isApplicationExit = false;
+    }
+    onApplicationBootstrap() {
+        msaLogger.debug('GracefulShutdownService.onApplicationBootstrap', { traceId: 'ON_APPLICATION_BOOTSTRAP' });
+        this.activeInterceptors = 0;
     }
     incActiveInterceptors() {
         this.activeInterceptors += 1;
@@ -46,7 +51,10 @@ let GracefulShutdownService = class GracefulShutdownService {
         msaLogger.debug(`GracefulShutdownService.decActiveInterceptors: ${this.activeInterceptors}`, { traceId: 'DEC_ACTIVE_INTERCEPTORS' });
     }
     async onApplicationShutdown(signal) {
+        this.isApplicationExit = true;
         msaLogger.debug(`GracefulShutdownService.onApplicationShutdown: ${signal}`, { traceId: 'ON_APPLICATION_SHUTDOWN' });
+        // eslint-disable-next-line max-len
+        msaLogger.debug(`GracefulShutdownService.onApplicationShutdown: activeInterceptors=${this.activeInterceptors}`, { traceId: 'ON_APPLICATION_SHUTDOWN' });
         while (this.activeInterceptors > 0) {
             // eslint-disable-next-line max-len
             msaLogger.debug(`GracefulShutdownService.onApplicationShutdown: waiting for ${this.activeInterceptors} interceptors to finish`, { traceId: 'ON_APPLICATION_SHUTDOWN' });
@@ -56,7 +64,9 @@ let GracefulShutdownService = class GracefulShutdownService {
         }
     }
     async onModuleDestroy() {
+        this.isApplicationExit = true;
         msaLogger.debug('GracefulShutdownService.onModuleDestroy', { traceId: 'ON_MODULE_DESTROY' });
+        msaLogger.debug(`GracefulShutdownService.onModuleDestroy: activeInterceptors=${this.activeInterceptors}`, { traceId: 'ON_MODULE_DESTROY' });
         while (this.activeInterceptors > 0) {
             // eslint-disable-next-line max-len
             msaLogger.debug(`GracefulShutdownService.onModuleDestroy: waiting for ${this.activeInterceptors} interceptors to finish`, { traceId: 'ON_MODULE_DESTROY' });

package/package.json

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