mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

logi: message -> msg

Browse source
This commit is contained in:
Alex Gleason 2025-01-29 12:30:46 -06:00
parent 449daf1e35
commit 8f4ae833ca
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
13 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/DittoPush.ts
View file

@ -24,7 +24,7 @@ export class DittoPush {
logi({ logi({
level: 'warn', level: 'warn',
ns: 'ditto.push', ns: 'ditto.push',
message: 'VAPID keys are not set. Push notifications will be disabled.', msg: 'VAPID keys are not set. Push notifications will be disabled.',
}); });
} }
})(); })();

2
src/controllers/api/streaming.ts
View file

@ -128,7 +128,7 @@ const streamingController: AppController = async (c) => {
} }
} }
} catch (e) { } catch (e) {
logi({ level: 'error', ns: 'ditto.streaming', message: 'Error in streaming', error: errorJson(e) }); logi({ level: 'error', ns: 'ditto.streaming', msg: 'Error in streaming', error: errorJson(e) });
} }
} }

8
src/controllers/api/trends.ts
View file

@ -18,7 +18,7 @@ let trendingHashtagsCache = getTrendingHashtags().catch((e: unknown) => {
level: 'error', level: 'error',
ns: 'ditto.trends.api', ns: 'ditto.trends.api',
type: 'tags', type: 'tags',
message: 'Failed to get trending hashtags', msg: 'Failed to get trending hashtags',
error: errorJson(e), error: errorJson(e),
}); });
return Promise.resolve([]); return Promise.resolve([]);
@ -33,7 +33,7 @@ Deno.cron('update trending hashtags cache', '35 * * * *', async () => {
level: 'error', level: 'error',
ns: 'ditto.trends.api', ns: 'ditto.trends.api',
type: 'tags', type: 'tags',
message: 'Failed to get trending hashtags', msg: 'Failed to get trending hashtags',
error: errorJson(e), error: errorJson(e),
}); });
} }
@ -76,7 +76,7 @@ let trendingLinksCache = getTrendingLinks().catch((e: unknown) => {
level: 'error', level: 'error',
ns: 'ditto.trends.api', ns: 'ditto.trends.api',
type: 'links', type: 'links',
message: 'Failed to get trending links', msg: 'Failed to get trending links',
error: errorJson(e), error: errorJson(e),
}); });
return Promise.resolve([]); return Promise.resolve([]);
@ -91,7 +91,7 @@ Deno.cron('update trending links cache', '50 * * * *', async () => {
level: 'error', level: 'error',
ns: 'ditto.trends.api', ns: 'ditto.trends.api',
type: 'links', type: 'links',
message: 'Failed to get trending links', msg: 'Failed to get trending links',
error: errorJson(e), error: errorJson(e),
}); });
} }

2
src/controllers/error.ts
View file

@ -19,7 +19,7 @@ export const errorHandler: ErrorHandler = (err, c) => {
return c.json({ error: 'The server was unable to respond in a timely manner' }, 500); return c.json({ error: 'The server was unable to respond in a timely manner' }, 500);
} }
logi({ level: 'error', ns: 'ditto.http', message: 'Unhandled error', error: errorJson(err) }); logi({ level: 'error', ns: 'ditto.http', msg: 'Unhandled error', error: errorJson(err) });
return c.json({ error: 'Something went wrong' }, 500); return c.json({ error: 'Something went wrong' }, 500);
}; };

2
src/controllers/frontend.ts
View file

@ -27,7 +27,7 @@ export const frontendController: AppMiddleware = async (c) => {
const meta = renderMetadata(c.req.url, entities); const meta = renderMetadata(c.req.url, entities);
return c.html(content.replace(META_PLACEHOLDER, meta)); return c.html(content.replace(META_PLACEHOLDER, meta));
} catch (e) { } catch (e) {
logi({ level: 'error', ns: 'ditto.frontend', message: 'Error building meta tags', error: errorJson(e) }); logi({ level: 'error', ns: 'ditto.frontend', msg: 'Error building meta tags', error: errorJson(e) });
return c.html(content); return c.html(content);
} }
} }

2
src/controllers/nostr/relay.ts
View file

@ -168,7 +168,7 @@ function connectStream(socket: WebSocket, ip: string | undefined) {
send(['OK', event.id, false, e.message]); send(['OK', event.id, false, e.message]);
} else { } else {
send(['OK', event.id, false, 'error: something went wrong']); send(['OK', event.id, false, 'error: something went wrong']);
logi({ level: 'error', ns: 'ditto.relay', message: 'Error in relay', error: errorJson(e) }); logi({ level: 'error', ns: 'ditto.relay', msg: 'Error in relay', error: errorJson(e) });
} }
} }
} }

8
src/db/DittoDB.ts
View file

@ -39,14 +39,14 @@ export class DittoDB {
}), }),
}); });
logi({ level: 'info', ns: 'ditto.db.migration', message: 'Running migrations...', state: 'started' }); logi({ level: 'info', ns: 'ditto.db.migration', msg: 'Running migrations...', state: 'started' });
const { results, error } = await migrator.migrateToLatest(); const { results, error } = await migrator.migrateToLatest();
if (error) { if (error) {
logi({ logi({
level: 'fatal', level: 'fatal',
ns: 'ditto.db.migration', ns: 'ditto.db.migration',
message: 'Migration failed.', msg: 'Migration failed.',
state: 'failed', state: 'failed',
results: results as unknown as JsonValue, results: results as unknown as JsonValue,
error: errorJson(error), error: errorJson(error),
@ -54,12 +54,12 @@ export class DittoDB {
Deno.exit(1); Deno.exit(1);
} else { } else {
if (!results?.length) { if (!results?.length) {
logi({ level: 'info', ns: 'ditto.db.migration', message: 'Everything up-to-date.', state: 'skipped' }); logi({ level: 'info', ns: 'ditto.db.migration', msg: 'Everything up-to-date.', state: 'skipped' });
} else { } else {
logi({ logi({
level: 'info', level: 'info',
ns: 'ditto.db.migration', ns: 'ditto.db.migration',
message: 'Migrations finished!', msg: 'Migrations finished!',
state: 'migrated', state: 'migrated',
results: results as unknown as JsonValue, results: results as unknown as JsonValue,
}); });

4
src/sentry.ts
View file

@ -5,11 +5,11 @@ import { Conf } from '@/config.ts';
// Sentry // Sentry
if (Conf.sentryDsn) { if (Conf.sentryDsn) {
logi({ level: 'info', ns: 'ditto.sentry', message: 'Sentry enabled.', enabled: true }); logi({ level: 'info', ns: 'ditto.sentry', msg: 'Sentry enabled.', enabled: true });
Sentry.init({ Sentry.init({
dsn: Conf.sentryDsn, dsn: Conf.sentryDsn,
tracesSampleRate: 1.0, tracesSampleRate: 1.0,
}); });
} else { } else {
logi({ level: 'info', ns: 'ditto.sentry', message: 'Sentry not configured. Skipping.', enabled: false }); logi({ level: 'info', ns: 'ditto.sentry', msg: 'Sentry not configured. Skipping.', enabled: false });
} }

2
src/server.ts
View file

@ -9,6 +9,6 @@ import { Conf } from '@/config.ts';
Deno.serve({ Deno.serve({
port: Conf.port, port: Conf.port,
onListen({ hostname, port }): void { onListen({ hostname, port }): void {
logi({ level: 'info', ns: 'ditto.server', message: `Listening on http://${hostname}:${port}`, hostname, port }); logi({ level: 'info', ns: 'ditto.server', msg: `Listening on http://${hostname}:${port}`, hostname, port });
}, },
}, app.fetch); }, app.fetch);

2
src/storages.ts
View file

@ -94,7 +94,7 @@ export class Storages {
logi({ logi({
level: 'info', level: 'info',
ns: 'ditto.pool', ns: 'ditto.pool',
message: `connecting to ${activeRelays.length} relays`, msg: `connecting to ${activeRelays.length} relays`,
relays: activeRelays, relays: activeRelays,
}); });

10
src/trends.ts
View file

@ -75,7 +75,7 @@ export async function updateTrendingTags(
values?: string[], values?: string[],
) { ) {
const params = { l, tagName, kinds, limit, extra, aliases, values }; const params = { l, tagName, kinds, limit, extra, aliases, values };
logi({ level: 'info', ns: 'ditto.trends', message: 'Updating trending', ...params }); logi({ level: 'info', ns: 'ditto.trends', msg: 'Updating trending', ...params });
const kysely = await Storages.kysely(); const kysely = await Storages.kysely();
const signal = AbortSignal.timeout(1000); const signal = AbortSignal.timeout(1000);
@ -94,9 +94,9 @@ export async function updateTrendingTags(
}, values); }, values);
if (trends.length) { if (trends.length) {
logi({ level: 'info', ns: 'ditto.trends', message: 'Trends found', trends, ...params }); logi({ level: 'info', ns: 'ditto.trends', msg: 'Trends found', trends, ...params });
} else { } else {
logi({ level: 'info', ns: 'ditto.trends', message: 'No trends found. Skipping.', ...params }); logi({ level: 'info', ns: 'ditto.trends', msg: 'No trends found. Skipping.', ...params });
return; return;
} }
@ -114,9 +114,9 @@ export async function updateTrendingTags(
}); });
await handleEvent(label, { source: 'internal', signal }); await handleEvent(label, { source: 'internal', signal });
logi({ level: 'info', ns: 'ditto.trends', message: 'Trends updated', ...params }); logi({ level: 'info', ns: 'ditto.trends', msg: 'Trends updated', ...params });
} catch (e) { } catch (e) {
logi({ level: 'error', ns: 'ditto.trends', message: 'Error updating trends', ...params, error: errorJson(e) }); logi({ level: 'error', ns: 'ditto.trends', msg: 'Error updating trends', ...params, error: errorJson(e) });
} }
} }

4
src/utils/log.ts
View file

@ -3,8 +3,8 @@ import { JsonValue } from '@std/json';
/** Serialize an error into JSON for JSON logging. */ /** Serialize an error into JSON for JSON logging. */
export function errorJson(error: unknown): JsonValue { export function errorJson(error: unknown): JsonValue {
if (error instanceof Error) { if (error instanceof Error) {
return { name: error.name, message: error.message, stack: error.stack }; return { name: error.name, msg: error.message, stack: error.stack };
} }
return { name: 'unknown', message: String(error) }; return { name: 'unknown', msg: String(error) };
} }

6
src/workers/policy.ts
View file

@ -56,7 +56,7 @@ class PolicyWorker implements NPolicy {
logi({ logi({
level: 'info', level: 'info',
ns: 'ditto.system.policy', ns: 'ditto.system.policy',
message: 'Using custom policy', msg: 'Using custom policy',
path: Conf.policy, path: Conf.policy,
enabled: true, enabled: true,
}); });
@ -65,7 +65,7 @@ class PolicyWorker implements NPolicy {
logi({ logi({
level: 'info', level: 'info',
ns: 'ditto.system.policy', ns: 'ditto.system.policy',
message: 'Custom policy not found <https://docs.soapbox.pub/ditto/policies/>', msg: 'Custom policy not found <https://docs.soapbox.pub/ditto/policies/>',
path: null, path: null,
enabled: false, enabled: false,
}); });
@ -77,7 +77,7 @@ class PolicyWorker implements NPolicy {
logi({ logi({
level: 'warn', level: 'warn',
ns: 'ditto.system.policy', ns: 'ditto.system.policy',
message: 'Custom policies are not supported with PGlite. The policy is disabled.', msg: 'Custom policies are not supported with PGlite. The policy is disabled.',
path: Conf.policy, path: Conf.policy,
enabled: false, enabled: false,
}); });