mirror of
https://gitlab.com/soapbox-pub/ditto.git
synced 2025-12-06 11:29:46 +00:00
KyselyLogger: improve parameter serialization
This commit is contained in:
parent
05c90fb677
commit
5ea33f6817
1 changed files with 20 additions and 8 deletions
|
|
@ -3,6 +3,7 @@ import { Logger } from 'kysely';
|
||||||
|
|
||||||
import { dbQueriesCounter, dbQueryDurationHistogram } from '@/metrics.ts';
|
import { dbQueriesCounter, dbQueryDurationHistogram } from '@/metrics.ts';
|
||||||
import { errorJson } from '@/utils/log.ts';
|
import { errorJson } from '@/utils/log.ts';
|
||||||
|
import { JsonValue } from '@std/json';
|
||||||
|
|
||||||
/** Log the SQL for queries. */
|
/** Log the SQL for queries. */
|
||||||
export const KyselyLogger: Logger = (event) => {
|
export const KyselyLogger: Logger = (event) => {
|
||||||
|
|
@ -14,14 +15,7 @@ export const KyselyLogger: Logger = (event) => {
|
||||||
dbQueriesCounter.inc();
|
dbQueriesCounter.inc();
|
||||||
dbQueryDurationHistogram.observe(duration);
|
dbQueryDurationHistogram.observe(duration);
|
||||||
|
|
||||||
/** Parameters serialized to JSON. */
|
const parameters = query.parameters.map(serializeParameter);
|
||||||
const parameters = query.parameters.map((parameter) => {
|
|
||||||
try {
|
|
||||||
return JSON.stringify(parameter);
|
|
||||||
} catch {
|
|
||||||
return String(parameter);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (event.level === 'query') {
|
if (event.level === 'query') {
|
||||||
logi({ level: 'debug', ns: 'ditto.sql', sql, parameters, duration });
|
logi({ level: 'debug', ns: 'ditto.sql', sql, parameters, duration });
|
||||||
|
|
@ -31,3 +25,21 @@ export const KyselyLogger: Logger = (event) => {
|
||||||
logi({ level: 'error', ns: 'ditto.sql', sql, parameters, error: errorJson(event.error), duration });
|
logi({ level: 'error', ns: 'ditto.sql', sql, parameters, 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue