Issue #129 - Read config using filesystem APIs rather than require

This commit is contained in:
Mike Taylor 2019-11-27 15:30:09 -06:00
Родитель 9bdab9fab1
Коммит afa4ac9843
2 изменённых файлов: 13 добавлений и 5 удалений

Просмотреть файл

@ -1,9 +1,10 @@
const config = require("./config.json");
const fetch = require("node-fetch"); const fetch = require("node-fetch");
const fs = require("fs").promises; const fs = require("fs");
const retry = require("promise-fn-retry"); const retry = require("promise-fn-retry");
const util = require("util"); const util = require("util");
const config = JSON.parse(fs.readFileSync("config.json", { encoding: "utf8" }));
/** /**
* Retry a bugzilla query. * Retry a bugzilla query.
* @param {String} query The specified bugzilla query * @param {String} query The specified bugzilla query
@ -241,8 +242,12 @@ async function recordCurrentDoc(currentDocId) {
config.startingSpreadsheetId = currentDocId; config.startingSpreadsheetId = currentDocId;
Promise.all([ Promise.all([
fs.writeFile("config.json", JSON.stringify(config, null, 2), "utf8"), fs.promises.writeFile(
fs.writeFile( "config.json",
JSON.stringify(config, null, 2),
"utf8"
),
fs.promises.writeFile(
`${config.currentDocPath}/currentDoc.json`, `${config.currentDocPath}/currentDoc.json`,
JSON.stringify({ currentDoc: currentDocId }), JSON.stringify({ currentDoc: currentDocId }),
"utf8" "utf8"

Просмотреть файл

@ -1,5 +1,6 @@
const { google } = require("googleapis"); const { google } = require("googleapis");
const bugs = require("./bugs"); const bugs = require("./bugs");
const fs = require("fs");
const helpers = require("./helpers"); const helpers = require("./helpers");
const spreadsheet = require("./spreadsheet"); const spreadsheet = require("./spreadsheet");
const tranco = require("./tranco"); const tranco = require("./tranco");
@ -7,7 +8,9 @@ const tranco = require("./tranco");
const argv = process.argv.slice(2); const argv = process.argv.slice(2);
const main = async () => { const main = async () => {
const config = require("./config.json"); const config = JSON.parse(
await fs.promises.readFile("config.json", { encoding: "utf8" })
);
const LIST_SIZE = config.listSize || 500; const LIST_SIZE = config.listSize || 500;
const LIST_DIR = config.listDir || "data/"; const LIST_DIR = config.listDir || "data/";
const bugzillaKey = config.bugzillaKey || ""; const bugzillaKey = config.bugzillaKey || "";