Skip to content

Commit 25723ee

Browse files
authored
Merge pull request #64 from devsapp/fix-logger
fix logger
2 parents e2a3703 + 516a02e commit 25723ee

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed

__tests__/it/integration_test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ describe('Integration Tests', () => {
7676
const region = process.env.REGION || 'cn-huhehaote';
7777
removeNullValues(output);
7878
delete output.functionArn;
79+
delete output.resourceGroupId;
7980
expect(output).toEqual({
8081
region,
8182
description: 'hello world by serverless devs',
@@ -115,6 +116,7 @@ describe('Integration Tests', () => {
115116
removeNullValues(output);
116117
delete output['url'];
117118
delete output.functionArn;
119+
delete output.resourceGroupId;
118120
const region = process.env.REGION || 'cn-huhehaote';
119121
expect(output).toEqual({
120122
region,

package-lock.json

Lines changed: 15 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"license": "ISC",
2424
"dependencies": {
2525
"@alicloud/fc2": "^2.6.6",
26-
"@alicloud/fc20230330": "4.3.3",
26+
"@alicloud/fc20230330": "4.3.4",
2727
"@alicloud/pop-core": "^1.8.0",
2828
"@serverless-cd/srm-aliyun-pop-core": "^0.0.7-beta.21",
2929
"@serverless-cd/srm-aliyun-ram20150501": "^0.0.2-beta.9",
@@ -58,7 +58,7 @@
5858
"@serverless-devs/component-interface": "^0.0.6",
5959
"@serverless-devs/logger": "^0.0.5",
6060
"@types/jest": "^29.5.14",
61-
"@types/lodash": "^4.17.16",
61+
"@types/lodash": "^4.17.20",
6262
"@types/node": "^20.12.11",
6363
"@vercel/ncc": "^0.38.3",
6464
"f2elint": "^2.2.1",

src/base.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ import { isAuto, isAppCenter } from './utils';
2020

2121
export default class Base {
2222
commands: any;
23+
logger: any;
2324
constructor({ logger }: any) {
24-
log._set(logger);
25-
25+
this.logger = logger || console;
26+
log._set(this.logger);
2627
this.commands = commandsHelp;
2728
}
2829

2930
// 在运行方法之前运行
3031
async handlePreRun(inputs: IInputs, needCredential: boolean) {
32+
log._set(this.logger);
3133
log.info(`userAgent: ${inputs.userAgent}`);
3234
if (isAppCenter()) {
3335
log.info(`input: ${JSON.stringify(inputs)}`);

0 commit comments

Comments
 (0)