From 482e61651a771e58abee17993ec8cceb306205b4 Mon Sep 17 00:00:00 2001 From: ls147258 Date: Thu, 17 Jul 2025 17:53:16 +0800 Subject: [PATCH] optimize logger in app center --- package-lock.json | 14 +++++------ package.json | 2 +- src/resources/fc/index.ts | 42 ++++++++++++++++++++------------- src/resources/sls/index.ts | 32 ++++++++++++++++--------- src/subCommands/deploy/index.ts | 4 ++-- 5 files changed, 57 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index 24440e19..1ad2d3e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@alicloud/fc2": "^2.6.6", "@alicloud/fc20230330": "4.3.4", "@alicloud/pop-core": "^1.8.0", - "@serverless-cd/srm-aliyun-pop-core": "^0.0.7-beta.21", + "@serverless-cd/srm-aliyun-pop-core": "^0.0.8-beta.1", "@serverless-cd/srm-aliyun-ram20150501": "^0.0.2-beta.9", "@serverless-cd/srm-aliyun-sls20201230": "0.0.5-beta.3", "@serverless-devs/diff": "^0.0.3-beta.6", @@ -2644,9 +2644,9 @@ "license": "ISC" }, "node_modules/@serverless-cd/srm-aliyun-pop-core": { - "version": "0.0.7-beta.21", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/@serverless-cd/srm-aliyun-pop-core/-/srm-aliyun-pop-core-0.0.7-beta.21.tgz", - "integrity": "sha512-lBuYGiERxcRYnBlomm2n8yThD72gpAmqzEsX2F7qoNHTx9S3soE1fvOg+dar61rEwIFIEvA9yBjdblCBP3FVbw==", + "version": "0.0.8-beta.1", + "resolved": "https://registry.npmmirror.com/@serverless-cd/srm-aliyun-pop-core/-/srm-aliyun-pop-core-0.0.8-beta.1.tgz", + "integrity": "sha512-0nR6EWJrHqrfZcBIUyM+oa9on9kdMB4yT6q+uX8Upg/CGiLzMSriDrBJGs9V+Cr7nZi3iczlGu4i7jt6uzDAqA==", "license": "ISC", "dependencies": { "@alicloud/fc2": "^2.6.3", @@ -17885,9 +17885,9 @@ "integrity": "sha512-7JEwVh8LaXvXyN4qMfUm4PASx+kAruO4euGt6cMiLIm1Z+E3pXDPTOajqG6g87PRWVe9iW93EwE3YdIblt/S2Q==" }, "@serverless-cd/srm-aliyun-pop-core": { - "version": "0.0.7-beta.21", - "resolved": "https://packages.aliyun.com/670e108663cd360abfe4be65/npm/npm-registry/@serverless-cd/srm-aliyun-pop-core/-/srm-aliyun-pop-core-0.0.7-beta.21.tgz", - "integrity": "sha512-lBuYGiERxcRYnBlomm2n8yThD72gpAmqzEsX2F7qoNHTx9S3soE1fvOg+dar61rEwIFIEvA9yBjdblCBP3FVbw==", + "version": "0.0.8-beta.1", + "resolved": "https://registry.npmmirror.com/@serverless-cd/srm-aliyun-pop-core/-/srm-aliyun-pop-core-0.0.8-beta.1.tgz", + "integrity": "sha512-0nR6EWJrHqrfZcBIUyM+oa9on9kdMB4yT6q+uX8Upg/CGiLzMSriDrBJGs9V+Cr7nZi3iczlGu4i7jt6uzDAqA==", "requires": { "@alicloud/fc2": "^2.6.3", "@alicloud/pop-core": "^1.7.12", diff --git a/package.json b/package.json index ded2c10f..e3c261fa 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@alicloud/fc2": "^2.6.6", "@alicloud/fc20230330": "4.3.4", "@alicloud/pop-core": "^1.8.0", - "@serverless-cd/srm-aliyun-pop-core": "^0.0.7-beta.21", + "@serverless-cd/srm-aliyun-pop-core": "^0.0.8-beta.1", "@serverless-cd/srm-aliyun-ram20150501": "^0.0.2-beta.9", "@serverless-cd/srm-aliyun-sls20201230": "0.0.5-beta.3", "@serverless-devs/diff": "^0.0.3-beta.6", diff --git a/src/resources/fc/index.ts b/src/resources/fc/index.ts index faf79bab..b1e9eb40 100644 --- a/src/resources/fc/index.ts +++ b/src/resources/fc/index.ts @@ -286,14 +286,20 @@ export default class FC extends FC_Client { throw ex; } retry += 1; - - logger.spin( - 'retrying', - 'function', - needUpdate ? 'update' : 'create', - `${this.region}/${config.functionName}`, - retry, - ); + if (isAppCenter()) { + const action = needUpdate ? 'update' : 'create'; + logger.info( + `retrying ${action} function ${this.region}/${config.functionName} ${retry} times`, + ); + } else { + logger.spin( + 'retrying', + 'function', + needUpdate ? 'update' : 'create', + `${this.region}/${config.functionName}`, + retry, + ); + } await sleep(retryTime); } } @@ -364,14 +370,18 @@ export default class FC extends FC_Client { throw ex; } retry += 1; - - logger.spin( - 'retrying', - 'trigger', - needUpdate ? 'update' : 'create', - `${this.region}/${id}`, - retry, - ); + if (isAppCenter()) { + const action = needUpdate ? 'update' : 'create'; + logger.info(`retrying ${action} trigger ${this.region}/${id} ${retry} times`); + } else { + logger.spin( + 'retrying', + 'trigger', + needUpdate ? 'update' : 'create', + `${this.region}/${id}`, + retry, + ); + } await sleep(3); } diff --git a/src/resources/sls/index.ts b/src/resources/sls/index.ts index a21d4942..1417a705 100644 --- a/src/resources/sls/index.ts +++ b/src/resources/sls/index.ts @@ -5,6 +5,7 @@ import { IRegion } from '../../interface'; import { PROJECT, LOG_STORE } from '../../default/resources'; import logger from '../../logger'; import getUuid from 'uuid-by-string'; +import { isAppCenter } from '../../utils/index'; export default class Sls { static generateProjectName = (region: IRegion, accountID: string): string => { @@ -51,18 +52,27 @@ export default class Sls { }); logger.debug(`init sls: ${JSON.stringify(request)}`); - - logger.spin( - 'creating', - 'sls', - `region: ${this.region}; project: ${project}; logstore: ${logstore}`, - ); + if (isAppCenter()) { + logger.info( + `creating sls region: ${this.region}; project: ${project}; logstore: ${logstore}`, + ); + } else { + logger.spin( + 'creating', + 'sls', + `region: ${this.region}; project: ${project}; logstore: ${logstore}`, + ); + } await this.client.initSls(request); - logger.spin( - 'created', - 'sls', - `region: ${this.region}; project: ${project}; logstore: ${logstore}`, - ); + if (isAppCenter()) { + logger.info(`created sls region: ${this.region}; project: ${project}; logstore: ${logstore}`); + } else { + logger.spin( + 'created', + 'sls', + `region: ${this.region}; project: ${project}; logstore: ${logstore}`, + ); + } return { project, logstore }; } } diff --git a/src/subCommands/deploy/index.ts b/src/subCommands/deploy/index.ts index d1c32cbd..fda48387 100644 --- a/src/subCommands/deploy/index.ts +++ b/src/subCommands/deploy/index.ts @@ -26,9 +26,9 @@ export default class Deploy { constructor(readonly inputs: IInputs) { if (isAppCenter()) { - logger.info(`input: ${JSON.stringify(inputs)}`); + logger.info(`input props: ${JSON.stringify(inputs.props)}`); } else { - logger.debug(`input: ${JSON.stringify(inputs)}`); + logger.debug(`input props: ${JSON.stringify(inputs.props)}`); } this.opts = parseArgv(inputs.args, { alias: {