amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep only the changes to loading the config files using glob patterns

Browse Source
This commit is contained in:
trivernis 2023-12-27 16:35:14 +01:00
parent df7f4aa3ec
commit 93094bcb72
No known key found for this signature in database
GPG Key ID: DFFFCC2C7A02DB45
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/backend/src/config.ts
View File

@ -183,33 +183,20 @@ const _dirname = dirname(_filename);
*/ */
const dir = `${_dirname}/../../../.config`; const dir = `${_dirname}/../../../.config`;
function buildPath() {
const envVars = ['MISSKEY_CONFIG_YML', 'SHARKEY_CONFIG_YML', 'SHARKEY_CONFIG_FILE'];
const envCfgFile = envVars
.map(v => process.env[v])
.map(v => v ? resolve(dir, v) : undefined)
.find(v => !!v);
if (envCfgFile) {
return envCfgFile;
}
if (process.env.NODE_ENV === 'test') {
return resolve(dir, 'test.yml');
}
return resolve(dir, 'default.yml');
}
/** /**
* Path of configuration file. Supports loading multiple files using glob syntax * Path of configuration file
*/ */
const path = buildPath(); const path = process.env.MISSKEY_CONFIG_YML
? resolve(dir, process.env.MISSKEY_CONFIG_YML)
: process.env.NODE_ENV === 'test'
? resolve(dir, 'test.yml')
: resolve(dir, 'default.yml');
export function loadConfig(): Config { export function loadConfig(): Config {
const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../built/meta.json`, 'utf-8')); const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../built/meta.json`, 'utf-8'));
const clientManifestExists = fs.existsSync(`${_dirname}/../../../built/_vite_/manifest.json`); const clientManifestExists = fs.existsSync(`${_dirname}/../../../built/_vite_/manifest.json`);
const clientManifest = clientManifestExists const clientManifest = clientManifestExists ?
? JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_vite_/manifest.json`, 'utf-8')) JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_vite_/manifest.json`, 'utf-8'))
: { 'src/_boot_.ts': { file: 'src/_boot_.ts' } }; : { 'src/_boot_.ts': { file: 'src/_boot_.ts' } };
const config = globSync(path) const config = globSync(path)