@yolo-croket-dev/core 1.9.7-slowquery.13 → 1.9.7-slowquery.15

package/interceptors/logging-service.interceptor.js

@@ -41,12 +41,6 @@ const operators_1 = require("rxjs/operators");
 const dd_trace_1 = __importDefault(require("dd-trace"));
 const { SERVER_NAME } = process.env;
 const msaLogger = new msa_logger_1.default(msa_logger_1.ServerTypeEnum.SERVICE);
-// interface IContent {
-//   pattern: string;
-//   data: IRequest;
-//   /** 무슨 아이디인지 모르겠음 */
-//   id: string;
-// }
 const MAX_CUT_LENGTH = 500;
 dd_trace_1.default.init();
 let LoggingServiceInterceptor = class LoggingServiceInterceptor {
@@ -113,9 +107,9 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
             // pastFrom = param.from ? JSON.parse(JSON.stringify(param.from)) : '-';
             // pastFromsForMessage = param.froms ? JSON.parse(JSON.stringify(param.froms)) : [pastFrom];
             originalMessage = rmqContext.getMessage();
-            pattern = originalMessage.messagePattern;
-            // const originalcontent = originalMessage.content;
-            // const content = JSON.parse(originalcontent.toString()) as IContent;
+            const originalcontent = originalMessage.content;
+            const content = JSON.parse(originalcontent.toString());
+            pattern = content.pattern;
             payload = context.switchToHttp().getRequest().payload;
         }
         // // @TODO: 삭제
@@ -143,8 +137,17 @@ let LoggingServiceInterceptor = class LoggingServiceInterceptor {
         const tmpFrom = `${SERVER_NAME}: ${pattern}`;
         const tmpFroms = JSON.parse(JSON.stringify(pastFroms));
         tmpFroms.push(tmpFrom);
-        data.param.from = tmpFrom;
-        data.param.froms = tmpFroms;
+        if (isGrpc) {
+            metadata.set('param', JSON.stringify({
+                ...pastParam,
+                from: tmpFrom,
+                froms: tmpFroms,
+            }));
+        }
+        else {
+            data.param.from = tmpFrom;
+            data.param.froms = tmpFroms;
+        }
         msaLogger.printInputInterceptorService({
             traceId,
             messageBrokerInfo: {

package/package.json

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

package/util.d.ts

@@ -1 +1,3 @@
 export declare function generateRandom(length: number, charset?: string): string;
+/** host에서 port를 추출합니다. */
+export declare function getPortFromHost(host: string): number | undefined;

package/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateRandom = void 0;
+exports.getPortFromHost = exports.generateRandom = void 0;
 const randomstring_1 = require("randomstring");
 function generateRandom(length, charset) {
     return (0, randomstring_1.generate)({
@@ -9,3 +9,9 @@ function generateRandom(length, charset) {
     });
 }
 exports.generateRandom = generateRandom;
+/** host에서 port를 추출합니다. */
+function getPortFromHost(host) {
+    const port = host.split(':')[1];
+    return port ? parseInt(port, 10) : undefined;
+}
+exports.getPortFromHost = getPortFromHost;