diff --git a/src/db/KyselyLogger.ts b/src/db/KyselyLogger.ts index 0f10834c..b640f5e5 100644 --- a/src/db/KyselyLogger.ts +++ b/src/db/KyselyLogger.ts @@ -8,38 +8,25 @@ import { errorJson } from '@/utils/log.ts'; /** Log the SQL for queries. */ export const KyselyLogger: Logger = (event) => { const { query, queryDurationMillis } = event; - const { sql } = query; + const { parameters, sql } = query; const duration = queryDurationMillis / 1000; dbQueriesCounter.inc(); dbQueryDurationHistogram.observe(duration); - const parameters = query.parameters.map(serializeParameter); - if (event.level === 'query') { - logi({ level: 'debug', ns: 'ditto.sql', sql, parameters, duration }); + logi({ level: 'debug', ns: 'ditto.sql', sql, parameters: parameters as JsonValue, duration }); } if (event.level === 'error') { - logi({ level: 'error', ns: 'ditto.sql', sql, parameters, error: errorJson(event.error), duration }); + logi({ + level: 'error', + ns: 'ditto.sql', + sql, + parameters: parameters as JsonValue, + error: errorJson(event.error), + duration, + }); } }; - -/** Serialize parameter to JSON. */ -function serializeParameter(parameter: unknown): JsonValue { - if (Array.isArray(parameter)) { - return parameter.map(serializeParameter); - } - if ( - typeof parameter === 'string' || typeof parameter === 'number' || typeof parameter === 'boolean' || - parameter === null - ) { - return parameter; - } - try { - return JSON.stringify(parameter); - } catch { - return String(parameter); - } -} diff --git a/src/startup.ts b/src/startup.ts index 16439c0b..7227cb8a 100644 --- a/src/startup.ts +++ b/src/startup.ts @@ -1,10 +1,26 @@ // Starts up applications required to run before the HTTP server is on. +import { logi } from '@soapbox/logi'; +import { encodeHex } from '@std/encoding/hex'; import { Conf } from '@/config.ts'; import { cron } from '@/cron.ts'; import { startFirehose } from '@/firehose.ts'; import { startNotify } from '@/notify.ts'; +logi.handler = (log) => { + console.log(JSON.stringify(log, (_key, value) => { + if (typeof value === 'bigint') { + return value.toString(); + } + + if (value instanceof Uint8Array) { + return '\\x' + encodeHex(value); + } + + return value; + })); +}; + if (Conf.firehoseEnabled) { startFirehose(); }