openharmony/developtools_ace_js2bundle
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_ace_js2bundle synced 2025-02-17 06:20:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!502 Fix transmit process env of child process

Browse Source 
Merge pull request !502 from zrg/fix_manage_work
This commit is contained in:
openharmony_ci 2023-01-12 07:40:02 +00:00 committed by Gitee
commit 08133d1a51
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ace-loader/src/genAbc-plugin.js
View File

@ -677,14 +677,16 @@ function initCmdPrefix(abcArgs) {
}
function processWorkersOfPreviewMode(splittedData, cmdPrefix, workerNumber) {
let envParams = {
let processEnv = Object.assign({}, process.env);
let arkEnvParams = {
'splittedData': JSON.stringify(splittedData),
'cmdPrefix': cmdPrefix,
'workerNumber': workerNumber.toString()
};
processEnv.arkEnvParams = JSON.stringify(arkEnvParams);
let genAbcCmd = `${nodeJs} ${path.resolve(__dirname, manageBunldeWorkersScript)}`;
childProcess.execSync(genAbcCmd, {env: envParams});
childProcess.execSync(genAbcCmd, {env: processEnv});
processExtraAssetForBundle();
}

18
ace-loader/src/manage-bundle-workers.js
View File

@ -19,17 +19,21 @@ import process from "process";
const genAbcScript = "gen-abc.js";
const FAIL = 1;
if (process.env["workerNumber"] !== undefined &&
process.env["splittedData"] !== undefined &&
process.env["cmdPrefix"] !== undefined
) {
if (process.env['arkEnvParams'] === undefined) {
process.exit(FAIL);
}
let arkEnvParams = JSON.parse(process.env['arkEnvParams']);
if (arkEnvParams['workerNumber'] !== undefined &&
arkEnvParams['splittedData'] !== undefined &&
arkEnvParams['cmdPrefix'] !== undefined) {
const clusterNewApiVersion = 16;
const currentNodeVersion = parseInt(process.version.split(".")[0]);
const useNewApi = currentNodeVersion >= clusterNewApiVersion;
let workerNumber = parseInt(process.env.workerNumber);
let splittedData = JSON.parse(process.env.splittedData);
let cmdPrefix = process.env.cmdPrefix;
let workerNumber = parseInt(arkEnvParams['workerNumber']);
let splittedData = JSON.parse(arkEnvParams['splittedData']);
let cmdPrefix = arkEnvParams['cmdPrefix'];
if ((useNewApi && cluster.isPrimary) || (!useNewApi && cluster.isMaster)) {
if (useNewApi) {