Skip to content

Commit e618940

Browse files
authored
Merge pull request #92 from Serverless-Devs/develop
execCommand support default_serverless_devs_auto_log
2 parents c91e3fa + fcccd42 commit e618940

5 files changed

Lines changed: 15 additions & 5 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@serverless-devs/core",
3-
"version": "0.1.47",
3+
"version": "0.1.48",
44
"description": "Serverless Devs Tool Core Component",
55
"keywords": [
66
"Serverless",

publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Type: Component
22
Name: core
33
Provider:
44
- 阿里云
5-
Version: 0.1.47
5+
Version: 0.1.48
66
Description: Serverless Devs 核心组件
77
HomePage: https://github.com/Serverless-Devs/core
88
Tags: #标签详情

src/common/execCommand/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ class ExecCommand {
6969
parse: this.parse, // 如果actions模块包含魔法变量,需要再次解析
7070
}).init();
7171
const result = { [serverName]: outPutData };
72+
if (process.env['default_serverless_devs_auto_log'] === 'false') {
73+
logger.log(`End of method: ${method}`, 'green');
74+
return result;
75+
}
7276
keys(outPutData).length === 0
7377
? logger.log(`End of method: ${method}`, 'green')
7478
: logger.output(result);
@@ -102,6 +106,10 @@ class ExecCommand {
102106
result[serverName] = outputData;
103107
logger.info(`Project ${serverName} successfully to execute \n\t`);
104108
}
109+
if (process.env['default_serverless_devs_auto_log'] === 'false') {
110+
logger.log(`End of method: ${method}`, 'green');
111+
return result;
112+
}
105113
keys(result).length === 0
106114
? logger.log(`End of method: ${method}`, 'green')
107115
: logger.output(result);

src/daemon/constant.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
DEFAULT_CORE_VERSION: '0.1.47',
2+
DEFAULT_CORE_VERSION: '0.1.48',
33
};

test/fixtures/execCommand.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ import { execCommand } from '../../src'
22

33
(async () => {
44
const data = await execCommand({
5+
56
syaml: '/Users/shihuali/workspace/a/start-fc-http-nodejs14/s.yaml',
67
args: ['-y', '--use-local'],
78
env: {
8-
serverless_devs_log_path: '/Users/shihuali/workspace/core/test/fs.log',
9+
// serverless_devs_log_path: '/Users/shihuali/workspace/core/test/fs.log',
910
// serverless_devs_log_debug: 'false',
11+
default_serverless_devs_auto_log: 'false',
1012
},
11-
method: 'plan'
13+
method: 'deploy'
1214
})
1315
console.log(data)
1416

0 commit comments

Comments
 (0)