diff options
| author | 4censord <mail@4censord.de> | 2024-08-03 17:42:59 +0200 |
|---|---|---|
| committer | 4censord <mail@4censord.de> | 2024-08-03 17:42:59 +0200 |
| commit | 12aeaa5f956d1c66f16e8092998f14bf64c045b6 (patch) | |
| tree | 2c9b4a7038401d47a145d88ed521bb458d68e786 | |
| parent | merge: error out when we can't start workers - fixes #586 (!578) (diff) | |
| download | sharkey-12aeaa5f956d1c66f16e8092998f14bf64c045b6.tar.gz sharkey-12aeaa5f956d1c66f16e8092998f14bf64c045b6.tar.bz2 sharkey-12aeaa5f956d1c66f16e8092998f14bf64c045b6.zip | |
Complain if no config-files are loaded
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | packages/backend/src/config.ts | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/package.json b/package.json index 519a8c453d..f60fd789db 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "build": "pnpm build-pre && pnpm -r build && pnpm build-assets", "build-storybook": "pnpm --filter frontend build-storybook", "build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api", - "start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js", + "start": "pnpm check:connect && cd packages/backend && MK_WARNED_ABOUT_CONFIG=true node ./built/boot/entry.js", "start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js", "init": "pnpm migrate", "migrate": "cd packages/backend && pnpm migrate", diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts index 92774328cc..15fc6fff28 100644 --- a/packages/backend/src/config.ts +++ b/packages/backend/src/config.ts @@ -222,8 +222,15 @@ export function loadConfig(): Config { JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_vite_/manifest.json`, 'utf-8')) : { 'src/_boot_.ts': { file: 'src/_boot_.ts' } }; - const config = globSync(path).sort() - .map(path => fs.readFileSync(path, 'utf-8')) + const configFiles = globSync(path).sort(); + + if (configFiles.length === 0 + && !process.env['MK_WARNED_ABOUT_CONFIG']) { + console.log('No config files loaded, check if this is intentional'); + process.env['MK_WARNED_ABOUT_CONFIG'] = true; + } + + const config = configFiles.map(path => fs.readFileSync(path, 'utf-8')) .map(contents => yaml.load(contents) as Source) .reduce( (acc: Source, cur: Source) => Object.assign(acc, cur), |