From 8f4ae833ca6d623e35ef78a4b31f58d3e286c4fc Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 29 Jan 2025 12:30:46 -0600 Subject: [PATCH] logi: message -> msg --- src/DittoPush.ts | 2 +- src/controllers/api/streaming.ts | 2 +- src/controllers/api/trends.ts | 8 ++++---- src/controllers/error.ts | 2 +- src/controllers/frontend.ts | 2 +- src/controllers/nostr/relay.ts | 2 +- src/db/DittoDB.ts | 8 ++++---- src/sentry.ts | 4 ++-- src/server.ts | 2 +- src/storages.ts | 2 +- src/trends.ts | 10 +++++----- src/utils/log.ts | 4 ++-- src/workers/policy.ts | 6 +++--- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/DittoPush.ts b/src/DittoPush.ts index b8e105d9..7f5dafa0 100644 --- a/src/DittoPush.ts +++ b/src/DittoPush.ts @@ -24,7 +24,7 @@ export class DittoPush { logi({ level: 'warn', 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.', }); } })(); diff --git a/src/controllers/api/streaming.ts b/src/controllers/api/streaming.ts index f067cd43..405de96c 100644 --- a/src/controllers/api/streaming.ts +++ b/src/controllers/api/streaming.ts @@ -128,7 +128,7 @@ const streamingController: AppController = async (c) => { } } } 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) }); } } diff --git a/src/controllers/api/trends.ts b/src/controllers/api/trends.ts index 6b064ed0..c2577e13 100644 --- a/src/controllers/api/trends.ts +++ b/src/controllers/api/trends.ts @@ -18,7 +18,7 @@ let trendingHashtagsCache = getTrendingHashtags().catch((e: unknown) => { level: 'error', ns: 'ditto.trends.api', type: 'tags', - message: 'Failed to get trending hashtags', + msg: 'Failed to get trending hashtags', error: errorJson(e), }); return Promise.resolve([]); @@ -33,7 +33,7 @@ Deno.cron('update trending hashtags cache', '35 * * * *', async () => { level: 'error', ns: 'ditto.trends.api', type: 'tags', - message: 'Failed to get trending hashtags', + msg: 'Failed to get trending hashtags', error: errorJson(e), }); } @@ -76,7 +76,7 @@ let trendingLinksCache = getTrendingLinks().catch((e: unknown) => { level: 'error', ns: 'ditto.trends.api', type: 'links', - message: 'Failed to get trending links', + msg: 'Failed to get trending links', error: errorJson(e), }); return Promise.resolve([]); @@ -91,7 +91,7 @@ Deno.cron('update trending links cache', '50 * * * *', async () => { level: 'error', ns: 'ditto.trends.api', type: 'links', - message: 'Failed to get trending links', + msg: 'Failed to get trending links', error: errorJson(e), }); } diff --git a/src/controllers/error.ts b/src/controllers/error.ts index a6a802ea..50962fcc 100644 --- a/src/controllers/error.ts +++ b/src/controllers/error.ts @@ -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); } - 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); }; diff --git a/src/controllers/frontend.ts b/src/controllers/frontend.ts index ad5c00dc..413b4ade 100644 --- a/src/controllers/frontend.ts +++ b/src/controllers/frontend.ts @@ -27,7 +27,7 @@ export const frontendController: AppMiddleware = async (c) => { const meta = renderMetadata(c.req.url, entities); return c.html(content.replace(META_PLACEHOLDER, meta)); } 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); } } diff --git a/src/controllers/nostr/relay.ts b/src/controllers/nostr/relay.ts index 5412cdc1..aa355928 100644 --- a/src/controllers/nostr/relay.ts +++ b/src/controllers/nostr/relay.ts @@ -168,7 +168,7 @@ function connectStream(socket: WebSocket, ip: string | undefined) { send(['OK', event.id, false, e.message]); } else { 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) }); } } } diff --git a/src/db/DittoDB.ts b/src/db/DittoDB.ts index ddc0b86d..8d242237 100644 --- a/src/db/DittoDB.ts +++ b/src/db/DittoDB.ts @@ -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(); if (error) { logi({ level: 'fatal', ns: 'ditto.db.migration', - message: 'Migration failed.', + msg: 'Migration failed.', state: 'failed', results: results as unknown as JsonValue, error: errorJson(error), @@ -54,12 +54,12 @@ export class DittoDB { Deno.exit(1); } else { 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 { logi({ level: 'info', ns: 'ditto.db.migration', - message: 'Migrations finished!', + msg: 'Migrations finished!', state: 'migrated', results: results as unknown as JsonValue, }); diff --git a/src/sentry.ts b/src/sentry.ts index 29a4288a..4875a12e 100644 --- a/src/sentry.ts +++ b/src/sentry.ts @@ -5,11 +5,11 @@ import { Conf } from '@/config.ts'; // Sentry 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({ dsn: Conf.sentryDsn, tracesSampleRate: 1.0, }); } 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 }); } diff --git a/src/server.ts b/src/server.ts index 513e55bd..c5815537 100644 --- a/src/server.ts +++ b/src/server.ts @@ -9,6 +9,6 @@ import { Conf } from '@/config.ts'; Deno.serve({ port: Conf.port, 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); diff --git a/src/storages.ts b/src/storages.ts index 8812f298..4a26ef32 100644 --- a/src/storages.ts +++ b/src/storages.ts @@ -94,7 +94,7 @@ export class Storages { logi({ level: 'info', ns: 'ditto.pool', - message: `connecting to ${activeRelays.length} relays`, + msg: `connecting to ${activeRelays.length} relays`, relays: activeRelays, }); diff --git a/src/trends.ts b/src/trends.ts index 1531597a..ed0ea930 100644 --- a/src/trends.ts +++ b/src/trends.ts @@ -75,7 +75,7 @@ export async function updateTrendingTags( values?: string[], ) { 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 signal = AbortSignal.timeout(1000); @@ -94,9 +94,9 @@ export async function updateTrendingTags( }, values); 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 { - 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; } @@ -114,9 +114,9 @@ export async function updateTrendingTags( }); 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) { - 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) }); } } diff --git a/src/utils/log.ts b/src/utils/log.ts index 4a96e39a..4d005a6f 100644 --- a/src/utils/log.ts +++ b/src/utils/log.ts @@ -3,8 +3,8 @@ import { JsonValue } from '@std/json'; /** Serialize an error into JSON for JSON logging. */ export function errorJson(error: unknown): JsonValue { 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) }; } diff --git a/src/workers/policy.ts b/src/workers/policy.ts index 92a9dd76..fdc33698 100644 --- a/src/workers/policy.ts +++ b/src/workers/policy.ts @@ -56,7 +56,7 @@ class PolicyWorker implements NPolicy { logi({ level: 'info', ns: 'ditto.system.policy', - message: 'Using custom policy', + msg: 'Using custom policy', path: Conf.policy, enabled: true, }); @@ -65,7 +65,7 @@ class PolicyWorker implements NPolicy { logi({ level: 'info', ns: 'ditto.system.policy', - message: 'Custom policy not found ', + msg: 'Custom policy not found ', path: null, enabled: false, }); @@ -77,7 +77,7 @@ class PolicyWorker implements NPolicy { logi({ level: 'warn', 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, enabled: false, });