phx-node 1.0.131 → 1.0.133
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 -6
- package/dist/module/cronjob-manager/cronjob-manager.service.js.map +1 -1
- package/dist/module/cronjob-manager/query.d.ts +1 -1
- package/dist/module/cronjob-manager/query.js +3 -2
- package/dist/module/cronjob-manager/query.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -49,9 +49,11 @@ let PHXCronjobManagerService = PHXCronjobManagerService_1 = class PHXCronjobMana
|
|
|
49
49
|
return;
|
|
50
50
|
}
|
|
51
51
|
for (const { hostname, school_id, isTenantMode } of listHostName) {
|
|
52
|
-
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);
|
|
53
55
|
if (!configItem) {
|
|
54
|
-
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}`);
|
|
55
57
|
continue;
|
|
56
58
|
}
|
|
57
59
|
const runType = configItem.cronjob_config_type_run.code;
|
|
@@ -64,13 +66,12 @@ let PHXCronjobManagerService = PHXCronjobManagerService_1 = class PHXCronjobMana
|
|
|
64
66
|
if (!isCronJobEnable)
|
|
65
67
|
continue;
|
|
66
68
|
try {
|
|
67
|
-
this.logger.log(`[${
|
|
68
|
-
const hostnameRun = isTenantMode ? `${query_1.HOSTNAME_MULTI_TESTING}?tenant_id=${school_id}` : hostname;
|
|
69
|
+
this.logger.log(`[${hostnameRun}, ${cronName}] start processing`);
|
|
69
70
|
yield taskService.init(hostnameRun);
|
|
70
|
-
this.logger.log(`[${
|
|
71
|
+
this.logger.log(`[${hostnameRun}, ${cronName}] completed`);
|
|
71
72
|
}
|
|
72
73
|
catch (error) {
|
|
73
|
-
this.logger.error(`[${
|
|
74
|
+
this.logger.error(`[${hostnameRun}, ${cronName}] failed`, (error === null || error === void 0 ? void 0 : error.stack) || error);
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
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;wBAED,KAAK,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,YAAY,EAAE,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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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export declare const HOSTNAME_MULTI_TESTING = "https://fly.phx-smartschool.com";
|
|
2
|
-
export declare const QUERY_GET_LIST_SCHOOL_MULTI = "\nquery GetListSchoolMainWrapV4 {\n school(where: {deleted_at: {_is_null: true}}) {\n id\n name\n hostname\n }\n}";
|
|
2
|
+
export declare const QUERY_GET_LIST_SCHOOL_MULTI = "\nquery GetListSchoolMainWrapV4 {\n school(where: {deleted_at: {_is_null: true}, hostname: {_is_null: false}}) {\n id\n name\n hostname\n }\n}\n";
|
|
@@ -4,10 +4,11 @@ exports.QUERY_GET_LIST_SCHOOL_MULTI = exports.HOSTNAME_MULTI_TESTING = void 0;
|
|
|
4
4
|
exports.HOSTNAME_MULTI_TESTING = 'https://fly.phx-smartschool.com';
|
|
5
5
|
exports.QUERY_GET_LIST_SCHOOL_MULTI = `
|
|
6
6
|
query GetListSchoolMainWrapV4 {
|
|
7
|
-
school(where: {deleted_at: {_is_null: true}}) {
|
|
7
|
+
school(where: {deleted_at: {_is_null: true}, hostname: {_is_null: false}}) {
|
|
8
8
|
id
|
|
9
9
|
name
|
|
10
10
|
hostname
|
|
11
11
|
}
|
|
12
|
-
}
|
|
12
|
+
}
|
|
13
|
+
`;
|
|
13
14
|
//# sourceMappingURL=query.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/query.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,iCAAiC,CAAA;AAC1D,QAAA,2BAA2B,GAAE
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/module/cronjob-manager/query.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,iCAAiC,CAAA;AAC1D,QAAA,2BAA2B,GAAE;;;;;;;;CAQzC,CAAA"}
|