phx-node 1.0.130 → 1.0.132
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/dist/module/cronjob-manager/cronjob-manager.service.js +7 -7
- package/dist/module/cronjob-manager/cronjob-manager.service.js.map +1 -1
- package/dist/module/cronjob-manager/schoollist.service.js +1 -1
- package/dist/module/cronjob-manager/schoollist.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -48,11 +48,12 @@ let PHXCronjobManagerService = PHXCronjobManagerService_1 = class PHXCronjobMana
|
|
|
48
48
|
listConfigCronjobByHostname.length === 0) {
|
|
49
49
|
return;
|
|
50
50
|
}
|
|
51
|
-
console.log('listHostName', listHostName);
|
|
52
51
|
for (const { hostname, school_id, isTenantMode } of listHostName) {
|
|
53
|
-
const
|
|
52
|
+
const hostnameConfig = isTenantMode ? query_1.HOSTNAME_MULTI_TESTING : hostname;
|
|
53
|
+
const hostnameRun = isTenantMode ? `${query_1.HOSTNAME_MULTI_TESTING}?tenant_id=${school_id}` : hostname;
|
|
54
|
+
const configItem = listConfigCronjobByHostname.find((item) => (item === null || item === void 0 ? void 0 : item.school.hostname) === hostnameConfig);
|
|
54
55
|
if (!configItem) {
|
|
55
|
-
this.logger.error(`Chưa cấu hình cronjob cho hostname: ${
|
|
56
|
+
this.logger.error(`Chưa cấu hình cronjob cho hostname: ${hostnameConfig}`);
|
|
56
57
|
continue;
|
|
57
58
|
}
|
|
58
59
|
const runType = configItem.cronjob_config_type_run.code;
|
|
@@ -65,13 +66,12 @@ let PHXCronjobManagerService = PHXCronjobManagerService_1 = class PHXCronjobMana
|
|
|
65
66
|
if (!isCronJobEnable)
|
|
66
67
|
continue;
|
|
67
68
|
try {
|
|
68
|
-
this.logger.log(`[${
|
|
69
|
-
const hostnameRun = isTenantMode ? `${query_1.HOSTNAME_MULTI_TESTING}?tenant_id=${school_id}` : hostname;
|
|
69
|
+
this.logger.log(`[${hostnameRun}, ${cronName}] start processing`);
|
|
70
70
|
yield taskService.init(hostnameRun);
|
|
71
|
-
this.logger.log(`[${
|
|
71
|
+
this.logger.log(`[${hostnameRun}, ${cronName}] completed`);
|
|
72
72
|
}
|
|
73
73
|
catch (error) {
|
|
74
|
-
this.logger.error(`[${
|
|
74
|
+
this.logger.error(`[${hostnameRun}, ${cronName}] failed`, (error === null || error === void 0 ? void 0 : error.stack) || error);
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cronjob-manager.service.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/cronjob-manager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,mEAA0D;AAO1D,6EAAmG;AACnG,6DAAuD;AACvD,mCAA+C;AAGxC,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IAGnC,YACmB,YAA6B,EAE7B,uBAAmD,EACnD,iBAAoC;QAHpC,iBAAY,GAAZ,YAAY,CAAiB;QAE7B,4BAAuB,GAAvB,uBAAuB,CAA4B;QACnD,sBAAiB,GAAjB,iBAAiB,CAAmB;QANtC,WAAM,GAAG,IAAI,eAAM,CAAC,0BAAwB,CAAC,IAAI,CAAC,CAAC;IAOjE,CAAC;IAEE,IAAI,CAAC,WAA+B;;YACxC,KAAK,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,WAAW,EAAE,CAAC;gBAC9D,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;oBAC3B,QAAQ;oBACR,QAAQ;oBACR,IAAI,EAAE,GAAS,EAAE;;wBACf,MAAM,CAAC,YAAY,EAAE,2BAA2B,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CACnE;4BACE,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE;4BACrC,IAAI,CAAC,uBAAuB,CAAC,aAAa,EAAE;yBAC7C,CACF,CAAC;wBAEF,IACE,YAAY,CAAC,MAAM,KAAK,CAAC;4BACzB,2BAA2B,CAAC,MAAM,KAAK,CAAC,EACxC,CAAC;4BACD,OAAO;wBACT,CAAC;
|
|
1
|
+
{"version":3,"file":"cronjob-manager.service.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/cronjob-manager.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ let SchoolListService = SchoolListService_1 = class SchoolListService {
|
|
|
45
45
|
.toPromise();
|
|
46
46
|
const listSchoolDataCenter = response.data.data || [];
|
|
47
47
|
const listSchoolMulti = yield this.getListSchoolMultiDB();
|
|
48
|
-
return [...listSchoolMulti, listSchoolDataCenter];
|
|
48
|
+
return [...listSchoolMulti, ...listSchoolDataCenter];
|
|
49
49
|
}
|
|
50
50
|
catch (error) {
|
|
51
51
|
this.logger.error(`Error occurred while sending request: ${error.message}`, error.stack);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schoollist.service.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/schoollist.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA4C;AAC5C,2CAAoD;AACpD,2CAA+C;AAC/C,mCAA4E;AAC5E,0FAAqF;AAG9E,IAAM,iBAAiB,yBAAvB,MAAM,iBAAiB;IAE5B,YACmB,aAA4B,EAC5B,WAAwB,EACxB,IAAgC;QAFhC,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,SAAI,GAAJ,IAAI,CAA4B;QAJlC,WAAM,GAAG,IAAI,eAAM,CAAC,mBAAiB,CAAC,IAAI,CAAC,CAAC;IAK1D,CAAC;IAES,YAAY;;YACvB,IAAI,CAAC;gBACH,MAAM,mBAAmB,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,uBAAuB,CAAC,CAAC;gBACpF,IAAI,CAAC,mBAAmB,EAAE,CAAC;oBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;oBAC7D,OAAO,EAAE,CAAC;gBACZ,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW;qBACpC,GAAG,CAAC,GAAG,mBAAmB,cAAc,CAAC;qBACzC,SAAS,EAAE,CAAC;gBACf,MAAM,oBAAoB,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;gBAGtD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAA;gBAEzD,OAAO,CAAC,GAAG,eAAe,EAAE,oBAAoB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"schoollist.service.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/schoollist.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA4C;AAC5C,2CAAoD;AACpD,2CAA+C;AAC/C,mCAA4E;AAC5E,0FAAqF;AAG9E,IAAM,iBAAiB,yBAAvB,MAAM,iBAAiB;IAE5B,YACmB,aAA4B,EAC5B,WAAwB,EACxB,IAAgC;QAFhC,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,SAAI,GAAJ,IAAI,CAA4B;QAJlC,WAAM,GAAG,IAAI,eAAM,CAAC,mBAAiB,CAAC,IAAI,CAAC,CAAC;IAK1D,CAAC;IAES,YAAY;;YACvB,IAAI,CAAC;gBACH,MAAM,mBAAmB,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,uBAAuB,CAAC,CAAC;gBACpF,IAAI,CAAC,mBAAmB,EAAE,CAAC;oBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;oBAC7D,OAAO,EAAE,CAAC;gBACZ,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW;qBACpC,GAAG,CAAC,GAAG,mBAAmB,cAAc,CAAC;qBACzC,SAAS,EAAE,CAAC;gBACf,MAAM,oBAAoB,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;gBAGtD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAA;gBAEzD,OAAO,CAAC,GAAG,eAAe,EAAE,GAAG,oBAAoB,CAAC,CAAC;YACvD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,yCAAyC,KAAK,CAAC,OAAO,EAAE,EACxD,KAAK,CAAC,KAAK,CACZ,CAAC;gBACF,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;KAAA;IAEa,oBAAoB;;YAChC,IAAI,CAAC;gBACH,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,KAAK,CAAC,KAAK,YAAY,CAAC;gBAChF,IAAG,CAAC,gBAAgB;oBAAE,OAAO,EAAE,CAAA;gBAE/B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAC,KAAK,EAAE,mCAA2B,EAAE,QAAQ,EAAE,8BAAsB,EAAC,CAAC,CAAA;gBAC9G,MAAM,MAAM,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,KAAI,EAAE,CAAA;gBACrC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,EAAC,EAAE,EAAE,QAAQ,EAAC,EAAE,EAAE,CAAC,CAAC,EAAC,SAAS,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAC,CAAC,CAAC,CAAA;YAClG,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,gCAAgC,CAAC,CAAC,OAAO,EAAE,EAC3C,CAAC,CAAC,KAAK,CACV,CAAC;YACJ,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AAjDY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAIuB,sBAAa;QACf,mBAAW;QAClB,uDAA0B;GALxC,iBAAiB,CAiD7B"}
|