Skip to content

Fix async file operations in validator #34062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luojiyin1987 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix async file operations in validator #34062

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions tools/validate/validate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,8 @@ const jsonSetMapReplacer = (k, v) => {
const writeFile = async (fname, data) => {
const dir = path.dirname(fname);
await fs.mkdir(dir, { recursive: true });
const promise = fs.writeFile(fname, data);
writeOps.push(promise);
return promise;
await fs.writeFile(fname, data);
};
const writeOps = [];

/******************************************************************************/

Expand Down Expand Up @@ -281,7 +278,7 @@ async function processList(parser, text, lineto, fpath) {
badHostnames.forEach(v => {
log(`${lineno} ${v}`);
});
writeFile(fpath, stdOutput.join('\n'));
await writeFile(fpath, stdOutput.join('\n'));
}
}
toProgressString(0);
Expand All @@ -308,12 +305,12 @@ async function main() {
const text = await fs.readFile(infile, { encoding: 'utf8' });
await processList(parser, text, lineto, partialResultPath);

writeFile(`${outdir}/${infileParts.name}.results.txt`, stdOutput.join('\n'));
writeFile(`${outdir}/${infileParts.name}.dns.results.txt`, JSON.stringify(validatedHostnames, jsonSetMapReplacer, 1));
await Promise.all([
writeFile(`${outdir}/${infileParts.name}.results.txt`, stdOutput.join('\n')),
writeFile(`${outdir}/${infileParts.name}.dns.results.txt`, JSON.stringify(validatedHostnames, jsonSetMapReplacer, 1)),
]);

fs.rm(partialResultPath);

await Promise.all(writeOps);
await fs.rm(partialResultPath, { force: true });
}

main();
Expand Down