logs p34

mprove-io · Nov 16, 2022 · 917f2f5 · 917f2f5
1 parent 626786f
commit 917f2f5
Show file tree

Hide file tree

Showing 17 changed files with 95 additions and 184 deletions.
diff --git a/.env.example b/.env.example
@@ -128,8 +128,6 @@ BACKEND_MAILGUN_DOMAIN=
 BACKEND_LOG_IS_JSON=FALSE
 BACKEND_LOG_RESPONSE_ERROR=FALSE
 BACKEND_LOG_RESPONSE_OK=FALSE
-BACKEND_LOG_ON_SENDER=FALSE
-BACKEND_LOG_ON_RESPONSER=TRUE
 
 BLOCKML_ENV=PROD
 BLOCKML_RABBIT_PROTOCOL=amqp
@@ -149,8 +147,6 @@ BLOCKML_CONCURRENCY_LIMIT=0
 BLOCKML_LOG_IS_JSON=FALSE
 BLOCKML_LOG_RESPONSE_ERROR=FALSE
 BLOCKML_LOG_RESPONSE_OK=FALSE
-BLOCKML_LOG_ON_SENDER=FALSE
-BLOCKML_LOG_ON_RESPONSER=TRUE
 
 DISK_ENV=PROD
 DISK_ORGANIZATIONS_PATH=/root/mprove_data/organizations
@@ -163,8 +159,6 @@ DISK_RABBIT_PORT=5672
 DISK_LOG_IS_JSON=FALSE
 DISK_LOG_RESPONSE_ERROR=FALSE
 DISK_LOG_RESPONSE_OK=FALSE
-DISK_LOG_ON_SENDER=FALSE
-DISK_LOG_ON_RESPONSER=TRUE
 
 CLI_TYPEORM_HOST=db
 CLI_TYPEORM_USERNAME=root

diff --git a/.helm/secret-values.yaml b/.helm/secret-values.yaml
diff --git a/apps/backend/src/config/get-dev.config.ts b/apps/backend/src/config/get-dev.config.ts
@@ -187,14 +187,6 @@ export function getDevConfig(envFilePath: any) {
 
     backendLogResponseOk: <common.BoolEnum>(
       (process.env.BACKEND_LOG_RESPONSE_OK || envFile.BACKEND_LOG_RESPONSE_OK)
-    ),
-
-    backendLogOnSender: <common.BoolEnum>(
-      (process.env.BACKEND_LOG_ON_SENDER || envFile.BACKEND_LOG_ON_SENDER)
-    ),
-
-    backendLogOnResponser: <common.BoolEnum>(
-      (process.env.BACKEND_LOG_ON_RESPONSER || envFile.BACKEND_LOG_ON_RESPONSER)
     )
   };
 

diff --git a/apps/backend/src/functions/log-response-backend.ts b/apps/backend/src/functions/log-response-backend.ts
@@ -26,12 +26,7 @@ export function logResponseBackend(item: {
     ) === common.BoolEnum.TRUE &&
     response.info.status === enums.ResponseInfoStatusEnum.Error;
 
-  if (
-    cs.get<interfaces.Config['backendLogOnResponser']>(
-      'backendLogOnResponser'
-    ) === common.BoolEnum.TRUE &&
-    (isLogOk || isLogError)
-  ) {
+  if (isLogOk || isLogError) {
     let log = {
       response: Object.assign({}, response, { payload: undefined })
     };

diff --git a/apps/backend/src/functions/make-error-response-backend.ts b/apps/backend/src/functions/make-error-response-backend.ts
@@ -28,11 +28,6 @@ export function makeErrorResponseBackend(item: {
         'backendLogResponseError'
       )
     ),
-    logOnResponser: common.enumToBoolean(
-      cs.get<interfaces.Config['backendLogOnResponser']>(
-        'backendLogOnResponser'
-      )
-    ),
     logIsJson: common.enumToBoolean(
       cs.get<interfaces.Config['backendLogIsJson']>('backendLogIsJson')
     ),

diff --git a/apps/backend/src/functions/make-ok-response-backend.ts b/apps/backend/src/functions/make-ok-response-backend.ts
@@ -26,11 +26,6 @@ export function makeOkResponseBackend(item: {
     logResponseOk: common.enumToBoolean(
       cs.get<interfaces.Config['backendLogResponseOk']>('backendLogResponseOk')
     ),
-    logOnResponser: common.enumToBoolean(
-      cs.get<interfaces.Config['backendLogOnResponser']>(
-        'backendLogOnResponser'
-      )
-    ),
     logIsJson: common.enumToBoolean(
       cs.get<interfaces.Config['backendLogIsJson']>('backendLogIsJson')
     ),

diff --git a/apps/backend/src/interfaces/config.ts b/apps/backend/src/interfaces/config.ts
@@ -151,10 +151,4 @@ export class Config {
 
   @IsEnum(common.BoolEnum)
   backendLogResponseOk?: common.BoolEnum;
-
-  @IsEnum(common.BoolEnum)
-  backendLogOnSender?: common.BoolEnum;
-
-  @IsEnum(common.BoolEnum)
-  backendLogOnResponser?: common.BoolEnum;
 }
diff --git a/apps/blockml/src/config/get-dev.config.ts b/apps/blockml/src/config/get-dev.config.ts
@@ -61,12 +61,6 @@ export function getDevConfig(envFilePath: any) {
     ),
     blockmlLogResponseOk: <common.BoolEnum>(
       (process.env.BLOCKML_LOG_RESPONSE_OK || envFile.BLOCKML_LOG_RESPONSE_OK)
-    ),
-    blockmlLogOnSender: <common.BoolEnum>(
-      (process.env.BLOCKML_LOG_ON_SENDER || envFile.BLOCKML_LOG_ON_SENDER)
-    ),
-    blockmlLogOnResponser: <common.BoolEnum>(
-      (process.env.BLOCKML_LOG_ON_RESPONSER || envFile.BLOCKML_LOG_ON_RESPONSER)
     )
   };
   return devConfig;

diff --git a/apps/blockml/src/functions/make-error-response-blockml.ts b/apps/blockml/src/functions/make-error-response-blockml.ts
@@ -28,11 +28,6 @@ export function makeErrorResponseBlockml(item: {
         'blockmlLogResponseError'
       )
     ),
-    logOnResponser: common.enumToBoolean(
-      cs.get<interfaces.Config['blockmlLogOnResponser']>(
-        'blockmlLogOnResponser'
-      )
-    ),
     logIsJson: common.enumToBoolean(
       cs.get<interfaces.Config['blockmlLogIsJson']>('blockmlLogIsJson')
     ),

diff --git a/apps/blockml/src/functions/make-ok-response-blockml.ts b/apps/blockml/src/functions/make-ok-response-blockml.ts
@@ -26,11 +26,6 @@ export function makeOkResponseBlockml(item: {
     logResponseOk: common.enumToBoolean(
       cs.get<interfaces.Config['blockmlLogResponseOk']>('blockmlLogResponseOk')
     ),
-    logOnResponser: common.enumToBoolean(
-      cs.get<interfaces.Config['blockmlLogOnResponser']>(
-        'blockmlLogOnResponser'
-      )
-    ),
     logIsJson: common.enumToBoolean(
       cs.get<interfaces.Config['blockmlLogIsJson']>('blockmlLogIsJson')
     ),

diff --git a/apps/blockml/src/interfaces/config.ts b/apps/blockml/src/interfaces/config.ts
@@ -53,10 +53,4 @@ export class Config {
 
   @IsEnum(common.BoolEnum)
   blockmlLogResponseOk?: common.BoolEnum;
-
-  @IsEnum(common.BoolEnum)
-  blockmlLogOnSender?: common.BoolEnum;
-
-  @IsEnum(common.BoolEnum)
-  blockmlLogOnResponser?: common.BoolEnum;
 }
diff --git a/apps/disk/src/config/get-dev.config.ts b/apps/disk/src/config/get-dev.config.ts
@@ -32,12 +32,6 @@ export function getDevConfig(envFilePath: any) {
     ),
     diskLogResponseOk: <common.BoolEnum>(
       (process.env.DISK_LOG_RESPONSE_OK || envFile.DISK_LOG_RESPONSE_OK)
-    ),
-    diskLogOnSender: <common.BoolEnum>(
-      (process.env.DISK_LOG_ON_SENDER || envFile.DISK_LOG_ON_SENDER)
-    ),
-    diskLogOnResponser: <common.BoolEnum>(
-      (process.env.DISK_LOG_ON_RESPONSER || envFile.DISK_LOG_ON_RESPONSER)
     )
   };
   return devConfig;

diff --git a/apps/disk/src/functions/make-error-response-disk.ts b/apps/disk/src/functions/make-error-response-disk.ts
@@ -26,9 +26,6 @@ export function makeErrorResponseDisk(item: {
     logResponseError: common.enumToBoolean(
       cs.get<interfaces.Config['diskLogResponseError']>('diskLogResponseError')
     ),
-    logOnResponser: common.enumToBoolean(
-      cs.get<interfaces.Config['diskLogOnResponser']>('diskLogOnResponser')
-    ),
     logIsJson: common.enumToBoolean(
       cs.get<interfaces.Config['diskLogIsJson']>('diskLogIsJson')
     ),

diff --git a/apps/disk/src/functions/make-ok-response-disk.ts b/apps/disk/src/functions/make-ok-response-disk.ts
@@ -26,9 +26,6 @@ export function makeOkResponseDisk(item: {
     logResponseOk: common.enumToBoolean(
       cs.get<interfaces.Config['diskLogResponseOk']>('diskLogResponseOk')
     ),
-    logOnResponser: common.enumToBoolean(
-      cs.get<interfaces.Config['diskLogOnResponser']>('diskLogOnResponser')
-    ),
     logIsJson: common.enumToBoolean(
       cs.get<interfaces.Config['diskLogIsJson']>('diskLogIsJson')
     ),

diff --git a/apps/disk/src/interfaces/config.ts b/apps/disk/src/interfaces/config.ts
@@ -32,10 +32,4 @@ export class Config {
 
   @IsEnum(common.BoolEnum)
   diskLogResponseOk?: common.BoolEnum;
-
-  @IsEnum(common.BoolEnum)
-  diskLogOnSender?: common.BoolEnum;
-
-  @IsEnum(common.BoolEnum)
-  diskLogOnResponser?: common.BoolEnum;
 }
diff --git a/libs/node-common/src/functions/make-error-response.ts b/libs/node-common/src/functions/make-error-response.ts
@@ -12,7 +12,6 @@ export function makeErrorResponse(item: {
   duration: number;
   skipLog?: boolean;
   logResponseError: boolean;
-  logOnResponser: boolean;
   logIsJson: boolean;
   logger: Logger;
 }) {
@@ -24,7 +23,6 @@ export function makeErrorResponse(item: {
     duration,
     skipLog,
     logResponseError,
-    logOnResponser,
     logIsJson,
     logger
   } = item;
@@ -41,11 +39,7 @@ export function makeErrorResponse(item: {
     payload: {}
   };
 
-  if (
-    logOnResponser === true &&
-    logResponseError === true &&
-    skipLog !== true
-  ) {
+  if (logResponseError === true && skipLog !== true) {
     let log = {
       response: Object.assign({}, response, { payload: undefined })
     };

diff --git a/libs/node-common/src/functions/make-ok-response.ts b/libs/node-common/src/functions/make-ok-response.ts
@@ -11,7 +11,6 @@ export function makeOkResponse(item: {
   duration: number;
   skipLog?: boolean;
   logResponseOk: boolean;
-  logOnResponser: boolean;
   logIsJson: boolean;
   logger: Logger;
 }) {
@@ -23,7 +22,6 @@ export function makeOkResponse(item: {
     duration,
     skipLog,
     logResponseOk,
-    logOnResponser,
     logIsJson,
     logger
   } = item;
@@ -39,7 +37,7 @@ export function makeOkResponse(item: {
     payload: payload
   };
 
-  if (logOnResponser === true && logResponseOk === true && skipLog !== true) {
+  if (logResponseOk === true && skipLog !== true) {
     let log = {
       response: Object.assign({}, response, { payload: undefined })
     };