@pisell/core 1.0.53 → 1.0.54
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/logger/index.js +22 -25
- package/lib/logger/index.js +0 -2
- package/package.json +1 -1
package/es/logger/index.js
CHANGED
|
@@ -308,18 +308,16 @@ var LoggerManager = /*#__PURE__*/function () {
|
|
|
308
308
|
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
|
309
309
|
while (1) switch (_context4.prev = _context4.next) {
|
|
310
310
|
case 0:
|
|
311
|
-
// 每次上传日志时,检查下IndexDB是否有日志,如果有则上传到AWS
|
|
312
|
-
this.uploadIndexDBLog();
|
|
313
311
|
if (!(this.logBuffer.length === 0 || !this.db)) {
|
|
314
|
-
_context4.next =
|
|
312
|
+
_context4.next = 2;
|
|
315
313
|
break;
|
|
316
314
|
}
|
|
317
315
|
return _context4.abrupt("return");
|
|
318
|
-
case
|
|
319
|
-
_context4.prev =
|
|
320
|
-
_context4.next =
|
|
316
|
+
case 2:
|
|
317
|
+
_context4.prev = 2;
|
|
318
|
+
_context4.next = 5;
|
|
321
319
|
return this.createAWSFileName(urgent);
|
|
322
|
-
case
|
|
320
|
+
case 5:
|
|
323
321
|
fileName = _context4.sent;
|
|
324
322
|
console.log("-------- 存储日志到AWS 开始", fileName);
|
|
325
323
|
|
|
@@ -333,13 +331,13 @@ var LoggerManager = /*#__PURE__*/function () {
|
|
|
333
331
|
return item.logId;
|
|
334
332
|
});
|
|
335
333
|
logs = JSON.stringify(buffer, null, 2);
|
|
336
|
-
_context4.next =
|
|
334
|
+
_context4.next = 12;
|
|
337
335
|
return this.app.aws.upload({
|
|
338
336
|
Bucket: "",
|
|
339
337
|
Key: fileName,
|
|
340
338
|
Body: logs
|
|
341
339
|
});
|
|
342
|
-
case
|
|
340
|
+
case 12:
|
|
343
341
|
this.addLog({
|
|
344
342
|
type: "info",
|
|
345
343
|
title: "存储日志到AWS 成功",
|
|
@@ -356,11 +354,11 @@ var LoggerManager = /*#__PURE__*/function () {
|
|
|
356
354
|
this.logBuffer = this.logBuffer.filter(function (item) {
|
|
357
355
|
return !bufferIds.includes(item.logId);
|
|
358
356
|
});
|
|
359
|
-
_context4.next =
|
|
357
|
+
_context4.next = 30;
|
|
360
358
|
break;
|
|
361
|
-
case
|
|
362
|
-
_context4.prev =
|
|
363
|
-
_context4.t0 = _context4["catch"](
|
|
359
|
+
case 17:
|
|
360
|
+
_context4.prev = 17;
|
|
361
|
+
_context4.t0 = _context4["catch"](2);
|
|
364
362
|
console.error("存储日志上传AWS失败:", _context4.t0);
|
|
365
363
|
this.addLog({
|
|
366
364
|
type: "info",
|
|
@@ -375,15 +373,15 @@ var LoggerManager = /*#__PURE__*/function () {
|
|
|
375
373
|
});
|
|
376
374
|
|
|
377
375
|
// 将日志存储到IndexDB
|
|
378
|
-
_context4.prev =
|
|
379
|
-
_context4.next =
|
|
376
|
+
_context4.prev = 21;
|
|
377
|
+
_context4.next = 24;
|
|
380
378
|
return this.storeLogToIndexDB();
|
|
381
|
-
case
|
|
382
|
-
_context4.next =
|
|
379
|
+
case 24:
|
|
380
|
+
_context4.next = 30;
|
|
383
381
|
break;
|
|
384
|
-
case
|
|
385
|
-
_context4.prev =
|
|
386
|
-
_context4.t1 = _context4["catch"](
|
|
382
|
+
case 26:
|
|
383
|
+
_context4.prev = 26;
|
|
384
|
+
_context4.t1 = _context4["catch"](21);
|
|
387
385
|
this.sendFeishuNotification({
|
|
388
386
|
type: "error",
|
|
389
387
|
title: "将日志存储到IndexDB失败",
|
|
@@ -396,11 +394,11 @@ var LoggerManager = /*#__PURE__*/function () {
|
|
|
396
394
|
}
|
|
397
395
|
});
|
|
398
396
|
console.error("存储日志到IndexDB也失败:", _context4.t1);
|
|
399
|
-
case
|
|
397
|
+
case 30:
|
|
400
398
|
case "end":
|
|
401
399
|
return _context4.stop();
|
|
402
400
|
}
|
|
403
|
-
}, _callee4, this, [[
|
|
401
|
+
}, _callee4, this, [[2, 17], [21, 26]]);
|
|
404
402
|
}));
|
|
405
403
|
function storeLog(_x2) {
|
|
406
404
|
return _storeLog.apply(this, arguments);
|
|
@@ -453,7 +451,7 @@ var LoggerManager = /*#__PURE__*/function () {
|
|
|
453
451
|
return (_this$db2 = this.db) === null || _this$db2 === void 0 ? void 0 : _this$db2.clear("logs");
|
|
454
452
|
case 18:
|
|
455
453
|
console.log("-------- 清空IndexDB日志成功");
|
|
456
|
-
_context5.next =
|
|
454
|
+
_context5.next = 25;
|
|
457
455
|
break;
|
|
458
456
|
case 21:
|
|
459
457
|
_context5.prev = 21;
|
|
@@ -482,8 +480,7 @@ var LoggerManager = /*#__PURE__*/function () {
|
|
|
482
480
|
// },
|
|
483
481
|
// });
|
|
484
482
|
// 重新抛出错误,让外层 catch 能够捕获
|
|
485
|
-
|
|
486
|
-
case 26:
|
|
483
|
+
case 25:
|
|
487
484
|
case "end":
|
|
488
485
|
return _context5.stop();
|
|
489
486
|
}
|
package/lib/logger/index.js
CHANGED
|
@@ -211,7 +211,6 @@ var LoggerManager = class {
|
|
|
211
211
|
*/
|
|
212
212
|
async storeLog(urgent) {
|
|
213
213
|
var _a;
|
|
214
|
-
this.uploadIndexDBLog();
|
|
215
214
|
if (this.logBuffer.length === 0 || !this.db) {
|
|
216
215
|
return;
|
|
217
216
|
}
|
|
@@ -302,7 +301,6 @@ var LoggerManager = class {
|
|
|
302
301
|
}
|
|
303
302
|
}
|
|
304
303
|
});
|
|
305
|
-
throw error;
|
|
306
304
|
}
|
|
307
305
|
}
|
|
308
306
|
async storeLogToIndexDB() {
|