Add query label to unknown sql error logs

This commit is contained in:
Sam Becker 2025-04-04 08:37:20 -05:00
parent 51ba7aed3b
commit 8423f3e4fb

View File

@ -69,8 +69,8 @@ const createPhotosTable = () =>
// Catch up to 3 migrations in older installations // Catch up to 3 migrations in older installations
const safelyQueryPhotos = async <T>( const safelyQueryPhotos = async <T>(
callback: () => Promise<T>, callback: () => Promise<T>,
debugMessage: string, queryLabel: string,
debugInfo?: GetPhotosOptions, queryOptions?: GetPhotosOptions,
): Promise<T> => { ): Promise<T> => {
let result: T; let result: T;
@ -121,24 +121,24 @@ const safelyQueryPhotos = async <T>(
try { try {
result = await callback(); result = await callback();
} catch (e: any) { } catch (e: any) {
console.log(`sql get error on retry (after 5000ms): ${e.message} `); console.log(`sql get error on retry (after 5000ms): ${e.message}`);
throw e; throw e;
} }
} else { } else {
if (e.message !== 'The server does not support SSL connections') { if (e.message !== 'The server does not support SSL connections') {
// Avoid re-logging errors on initial installation // Avoid re-logging errors on initial installation
console.log(`sql get error: ${e.message} `); console.log(`sql get error (${queryLabel}): ${e.message}`);
} }
throw e; throw e;
} }
} }
if (ADMIN_SQL_DEBUG_ENABLED && debugMessage) { if (ADMIN_SQL_DEBUG_ENABLED && queryLabel) {
const time = const time =
(((new Date()).getTime() - start.getTime()) / 1000).toFixed(2); (((new Date()).getTime() - start.getTime()) / 1000).toFixed(2);
const message = `Debug query: ${debugMessage} (${time} seconds)`; const message = `Debug query: ${queryLabel} (${time} seconds)`;
if (debugInfo) { if (queryOptions) {
console.log(message, { options: debugInfo }); console.log(message, { options: queryOptions });
} else { } else {
console.log(message); console.log(message);
} }