Format and make the error a warning

This commit is contained in:
Owen
2026-05-06 15:51:05 -07:00
parent ce7df5ddaa
commit 49c7319342

View File

@@ -29,7 +29,10 @@ import { decrypt } from "@server/lib/crypto";
import logger from "@server/logger"; import logger from "@server/logger";
import { sendAlertWebhook } from "./sendAlertWebhook"; import { sendAlertWebhook } from "./sendAlertWebhook";
import { sendAlertEmail } from "./sendAlertEmail"; import { sendAlertEmail } from "./sendAlertEmail";
import { AlertContext, WebhookAlertConfig } from "@server/routers/alertRule/types"; import {
AlertContext,
WebhookAlertConfig
} from "@server/routers/alertRule/types";
/** /**
* Core alert processing pipeline. * Core alert processing pipeline.
@@ -99,7 +102,10 @@ export async function processAlerts(context: AlertContext): Promise<void> {
baseConditions, baseConditions,
or( or(
eq(alertRules.allHealthChecks, true), eq(alertRules.allHealthChecks, true),
eq(alertHealthChecks.healthCheckId, context.healthCheckId) eq(
alertHealthChecks.healthCheckId,
context.healthCheckId
)
) )
) )
); );
@@ -208,14 +214,19 @@ async function processRule(
for (const action of emailActions) { for (const action of emailActions) {
try { try {
const recipients = await resolveEmailRecipients(action.emailActionId); const recipients = await resolveEmailRecipients(
action.emailActionId
);
if (recipients.length > 0) { if (recipients.length > 0) {
await sendAlertEmail(recipients, context); await sendAlertEmail(recipients, context);
await db await db
.update(alertEmailActions) .update(alertEmailActions)
.set({ lastSentAt: now }) .set({ lastSentAt: now })
.where( .where(
eq(alertEmailActions.emailActionId, action.emailActionId) eq(
alertEmailActions.emailActionId,
action.emailActionId
)
); );
} }
} catch (err) { } catch (err) {
@@ -269,7 +280,7 @@ async function processRule(
) )
); );
} catch (err) { } catch (err) {
logger.error( logger.warn(
`processAlerts: failed to send alert webhook for action ${action.webhookActionId}`, `processAlerts: failed to send alert webhook for action ${action.webhookActionId}`,
err err
); );
@@ -289,7 +300,9 @@ async function processRule(
* - All users in a role (by `roleId`, resolved via `userOrgRoles`) * - All users in a role (by `roleId`, resolved via `userOrgRoles`)
* - Direct external email addresses * - Direct external email addresses
*/ */
async function resolveEmailRecipients(emailActionId: number): Promise<string[]> { async function resolveEmailRecipients(
emailActionId: number
): Promise<string[]> {
const rows = await db const rows = await db
.select() .select()
.from(alertEmailRecipients) .from(alertEmailRecipients)