Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fc5c9b5

Browse files
author
欧如栋
committed
日志记录优化
1 parent 7faff7f commit fc5c9b5

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

‎bin/index.js

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@ const upload = async (filePath, parts = [], requestUrl) => {
7474
} else {
7575
console.log(chalk.red('网络连接异常,请重新执行命令继续上传'));
7676
logger.error(`分片(${currentChunkIndex})上传时网络连接异常 (path: ${filePath}) , url: ${requestUrl})`);
77+
await logger.close();
7778
process.exit(1);
7879
}
7980
} else {
8081
console.log(chalk.red((error.response && error.response.data) || error.message));
82+
await logger.close();
8183
process.exit(1);
8284
}
8385
}
@@ -119,6 +121,7 @@ const upload = async (filePath, parts = [], requestUrl) => {
119121
logger.error(error.message);
120122
logger.error(error.stack);
121123
console.log(chalk(error.message));
124+
await logger.close();
122125
process.exit(1);
123126
}
124127

@@ -150,6 +153,7 @@ const upload = async (filePath, parts = [], requestUrl) => {
150153
logger.error(error.message);
151154
logger.error(error.stack);
152155
console.log(chalk.red((error.response && error.response.data) || error.message));
156+
await logger.close();
153157
process.exit(1);
154158
}
155159

@@ -169,6 +173,7 @@ const getFileMD5Success = async (filePath, requestUrl) => {
169173
Authorization
170174
});
171175
if (res.code) {
176+
logger.info(`获取已上传信息错误(1): ${JSON.stringify(res)} (path: ${filePath} , url: ${requestUrl})`);
172177
throw (res.message);
173178
}
174179
uploadId = res.data.uploadId;
@@ -181,10 +186,11 @@ const getFileMD5Success = async (filePath, requestUrl) => {
181186
uploadedParts = []
182187
}
183188
} catch (error) {
184-
logger.error(`获取已上传信息错误 (path: ${filePath} , url: ${requestUrl})`);
189+
logger.error(`获取已上传信息错误(2) (path: ${filePath} , url: ${requestUrl})`);
185190
logger.error(error.message);
186191
logger.error(error.stack);
187192
console.log(chalk.red((error.response && error.response.data) || error.message));
193+
await logger.close();
188194
process.exit(1);
189195
}
190196

@@ -227,13 +233,14 @@ const getFileMD5 = async (filePath, requestUrl) => {
227233
console.log(chalk.red((error.response && error.response.data) || error.message));
228234
logger.error(error.message);
229235
logger.error(error.stack);
236+
await logger.close();
230237
process.exit(1);
231238
}
232239
}
233240

234241
const uploadFile = async (filePath, size, requestUrl) => {
235242
fileSize = size;
236-
logger.info(`('************************ 开始上传 (${filePath}) ('************************`);
243+
logger.info(`************************ 开始上传 (${filePath}) ************************`);
237244
await getFileMD5(filePath, requestUrl);
238245
md5 = '';
239246
uploadId = '';
@@ -262,6 +269,7 @@ const uploadDir = async (dir) => {
262269
console.log(chalk.red((error.response && error.response.data) || error.message));
263270
logger.error(error.message);
264271
logger.error(error.stack);
272+
await logger.close();
265273
process.exit(1);
266274
} else {
267275
return files;
@@ -290,9 +298,11 @@ const beforeUpload = async (filePath) => {
290298
const isDirectory = stat.isDirectory();
291299
if (isDirectory && !isUploadDir) {
292300
console.log(chalk.red(`\n${filePath}不合法,需指定一个文件\n`))
301+
await logger.close();
293302
process.exit(1);
294303
} else if (!isDirectory && isUploadDir) {
295304
console.log(chalk.red(`\n${filePath}不合法,需指定一个文件夹\n`))
305+
await logger.close();
296306
process.exit(1);
297307
}
298308
fSize = stat.size;
@@ -304,6 +314,7 @@ const beforeUpload = async (filePath) => {
304314
logger.error(error.stack);
305315
console.log(chalk.red((error.response && error.response.data) || error.message));
306316
}
317+
await logger.close();
307318
process.exit(1);
308319
}
309320
if (isUploadDir) {
@@ -313,16 +324,18 @@ const beforeUpload = async (filePath) => {
313324
}
314325
}
315326

316-
const onUpload = (_username, _password) => {
327+
const onUpload = async(_username, _password) => {
317328
Authorization = generateAuthorization(_username, _password);
318329

319330
logger.info('************************ 准备上传 ************************')
320331

321332
if (path.isAbsolute(argv.path)) {
322-
beforeUpload(argv.path);
333+
awaitbeforeUpload(argv.path);
323334
} else {
324-
beforeUpload(path.join(process.cwd(), argv.path))
335+
awaitbeforeUpload(path.join(process.cwd(), argv.path))
325336
}
337+
338+
await logger.close();
326339
}
327340

328341
const [username, password] = argv.username.split(':');

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "coding-generic",
3-
"version": "1.2.9",
3+
"version": "1.2.10",
44
"description": "",
55
"main": "index.js",
66
"bin": {

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /