mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-07 20:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: Log config file paths at startup (!1066)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1066

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Marie 2025-05-30 16:25:28 +00:00
commit 5d8a8bba2a
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
packages/backend/src/config.ts
View file

@ -9,6 +9,7 @@ import { dirname, resolve } from 'node:path';
import * as yaml from 'js-yaml'; import * as yaml from 'js-yaml';
import { globSync } from 'glob'; import { globSync } from 'glob';
import ipaddr from 'ipaddr.js'; import ipaddr from 'ipaddr.js';
import Logger from './logger.js';
import type * as Sentry from '@sentry/node'; import type * as Sentry from '@sentry/node';
import type * as SentryVue from '@sentry/vue'; import type * as SentryVue from '@sentry/vue';
import type { RedisOptions } from 'ioredis'; import type { RedisOptions } from 'ioredis';
@ -155,6 +156,8 @@ type Source = {
} }
}; };
const configLogger = new Logger('config');
export type PrivateNetworkSource = string | { network?: string, ports?: number[] }; export type PrivateNetworkSource = string | { network?: string, ports?: number[] };
export type PrivateNetwork = { export type PrivateNetwork = {
@ -192,7 +195,7 @@ export function parsePrivateNetworks(patterns: PrivateNetworkSource[] | undefine
} }
} }
console.warn('[config] Skipping invalid entry in allowedPrivateNetworks: ', e); configLogger.warn('Skipping invalid entry in allowedPrivateNetworks: ', e);
return null; return null;
}) })
.filter(p => p != null); .filter(p => p != null);
@ -375,11 +378,14 @@ export function loadConfig(): Config {
if (configFiles.length === 0 if (configFiles.length === 0
&& !process.env['MK_WARNED_ABOUT_CONFIG']) { && !process.env['MK_WARNED_ABOUT_CONFIG']) {
console.log('No config files loaded, check if this is intentional'); configLogger.warn('No config files loaded, check if this is intentional');
process.env['MK_WARNED_ABOUT_CONFIG'] = '1'; process.env['MK_WARNED_ABOUT_CONFIG'] = '1';
} }
const config = configFiles.map(path => fs.readFileSync(path, 'utf-8')) const config = configFiles.map(path => {
configLogger.info(`Reading configuration from ${path}`);
return fs.readFileSync(path, 'utf-8');
})
.map(contents => yaml.load(contents) as Source) .map(contents => yaml.load(contents) as Source)
.reduce( .reduce(
(acc: Source, cur: Source) => Object.assign(acc, cur), (acc: Source, cur: Source) => Object.assign(acc, cur),
@ -496,6 +502,10 @@ export function loadConfig(): Config {
} }
function tryCreateUrl(url: string) { function tryCreateUrl(url: string) {
if (!url) {
throw new Error('Failed to load: no "url" property found in config. Please check the value of "MISSKEY_CONFIG_DIR" and "MISSKEY_CONFIG_YML", and verify that all configuration files are correct.');
}
try { try {
return new URL(url); return new URL(url);
} catch (e) { } catch (e) {