utiller 1.0.135 → 1.0.138
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/lib/pooller/index.js +13 -6
- package/package.json +1 -1
- package/template/sample.package.json +1 -1
package/lib/pooller/index.js
CHANGED
|
@@ -231,7 +231,7 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
231
231
|
|
|
232
232
|
self.updateExecuteTaskState(hashOfTask);
|
|
233
233
|
assignedTask(param).then(function (result) {
|
|
234
|
-
_this.printLogMessage("984545, \u5BA2\u7AEF\u59D4\u8A17\u7684\u4EFB\u52D9,resolve\u56DE\u61C9: ".concat(result));
|
|
234
|
+
_this.printLogMessage("984545, \u5BA2\u7AEF\u59D4\u8A17\u7684\u4EFB\u52D9(TASK HASH:".concat(hashOfTask, "),resolve\u56DE\u61C9: ").concat(result));
|
|
235
235
|
|
|
236
236
|
assignedTaskResult = result;
|
|
237
237
|
isAssignedTaskCompleted = true;
|
|
@@ -244,13 +244,15 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
244
244
|
clearTimeout(timeoutHash);
|
|
245
245
|
resolve();
|
|
246
246
|
|
|
247
|
-
_this.printLogMessage("98942, taskWrapper()\u88E1\u9762\u7B2C\u4E00\u500Bpromise(\u70BA\u4E86timeout\u8A2D\u8A08)\u5B8C\u6210\u4E86");
|
|
247
|
+
_this.printLogMessage("98942,(TASK HASH:".concat(hashOfTask, ") taskWrapper()\u88E1\u9762\u7B2C\u4E00\u500Bpromise(\u70BA\u4E86timeout\u8A2D\u8A08)\u5B8C\u6210\u4E86"));
|
|
248
248
|
});
|
|
249
249
|
}).then(function (result) {
|
|
250
250
|
/** 能走到這裡,代表沒有timeout的狀況下,執行了委託的任務 */
|
|
251
251
|
if (!isAssignedTaskCompleted) {
|
|
252
252
|
throw assignedTaskError;
|
|
253
253
|
} else {
|
|
254
|
+
_this.printLogMessage("9894841,(TASK HASH:".concat(hashOfTask, ") taskWrapper()\u88E1\u9762\u7B2C\u4E8C\u500Bpromise(\u6574\u500B\u4EFB\u52D9)\u5B8C\u6210\u4E86"));
|
|
255
|
+
|
|
254
256
|
return "".concat(_this.getLogMessageOfTaskHash(hashOfTask), " completed");
|
|
255
257
|
}
|
|
256
258
|
})["catch"](function (error) {
|
|
@@ -647,6 +649,9 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
647
649
|
(0, _defineProperty2["default"])(this, "getLogMessageOfExecutingTaskQueueCount", function () {
|
|
648
650
|
return "ExecutingTaskQueueCount: ".concat(_lodash["default"].size(_this.queueOfExecutingTask));
|
|
649
651
|
});
|
|
652
|
+
(0, _defineProperty2["default"])(this, "getLogMessageOfAssignTaskQueueCount", function () {
|
|
653
|
+
return "AssignTaskQueueCount: ".concat(_this.getCountOfAssignTaskInQueue());
|
|
654
|
+
});
|
|
650
655
|
(0, _defineProperty2["default"])(this, "getLogMessageOfTaskHash", function (hash) {
|
|
651
656
|
return "TASK HASH: ".concat(hash);
|
|
652
657
|
});
|
|
@@ -680,8 +685,8 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
680
685
|
tasks = self.queueOfExecutingTask.filter(function (each) {
|
|
681
686
|
return _lodash["default"].isEqual(each.state, "NOT");
|
|
682
687
|
}).map(function (each) {
|
|
683
|
-
var
|
|
684
|
-
return
|
|
688
|
+
var taskWrapper = each.task;
|
|
689
|
+
return taskWrapper();
|
|
685
690
|
});
|
|
686
691
|
/** Util.appendInfo(`\n\n正要執行的隊列`,self.queueOfExecutingTask) */
|
|
687
692
|
|
|
@@ -724,7 +729,7 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
724
729
|
case 9:
|
|
725
730
|
task = _context8.sent;
|
|
726
731
|
|
|
727
|
-
_this.printLogMessage("4512213 \u5B8C\u7562\u4EFB\u52D9(taskWrapper:".concat(task, "), ").concat(_this.getLogMessageOfExecutingTaskQueueCount()));
|
|
732
|
+
_this.printLogMessage("4512213 \u5B8C\u7562\u4EFB\u52D9(taskWrapper:".concat(task, "), ").concat(_this.getLogMessageOfExecutingTaskQueueCount(), ", ").concat(_this.getLogMessageOfAssignTaskQueueCount()));
|
|
728
733
|
|
|
729
734
|
_context8.next = 14;
|
|
730
735
|
break;
|
|
@@ -790,6 +795,8 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
790
795
|
var callbackWrapper = _this.mapOfHashNCallbackWrapper[hash];
|
|
791
796
|
|
|
792
797
|
if (callbackWrapper !== undefined) {
|
|
798
|
+
_this.printLogMessage("5644153248, removeResolveOrRejectPromiseByHash \u62FF\u6389\u4E86\u5B8C\u6210\u7684\u4EFB\u52D9(".concat(_this.getLogMessageOfTaskHash(hash), ")"));
|
|
799
|
+
|
|
793
800
|
callbackWrapper(result);
|
|
794
801
|
delete _this.mapOfHashNCallbackWrapper[hash];
|
|
795
802
|
}
|
|
@@ -797,7 +804,7 @@ var InfinitePool = /*#__PURE__*/function () {
|
|
|
797
804
|
_this.removePromiseFromExecutingQueue(hash);
|
|
798
805
|
});
|
|
799
806
|
(0, _defineProperty2["default"])(this, "removePromiseFromExecutingQueue", function (hash) {
|
|
800
|
-
_this.printLogMessage("QueueOfExecutingTask \u62FF\u6389\u4E86\u5B8C\u6210\u7684\u4EFB\u52D9 ".concat(_this.getLogMessageOfTaskHash(hash)));
|
|
807
|
+
_this.printLogMessage("56448412, QueueOfExecutingTask \u62FF\u6389\u4E86\u5B8C\u6210\u7684\u4EFB\u52D9 ".concat(_this.getLogMessageOfTaskHash(hash)));
|
|
801
808
|
|
|
802
809
|
_lodash["default"].remove(_this.queueOfExecutingTask, function (each) {
|
|
803
810
|
return _lodash["default"].isEqual(hash, each.hash);
|
package/package.json
CHANGED