Skip to content

Commit 457273e

Browse files
authored
Fix email alert failures because of newlines in error messages (fixes #1745) (#1749)
1 parent c315e38 commit 457273e

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

internal-packages/emails/src/index.tsx

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import MagicLinkEmail from "../emails/magic-link";
1515
import WelcomeEmail from "../emails/welcome";
1616
import { constructMailTransport, MailTransport, MailTransportOptions } from "./transports";
1717

18-
export { type MailTransportOptions }
18+
export { type MailTransportOptions };
1919

2020
export const DeliverEmailSchema = z
2121
.discriminatedUnion("email", [
@@ -109,7 +109,9 @@ export class EmailClient {
109109
}
110110
case "alert-run": {
111111
return {
112-
subject: `[${data.organization}] Run ${data.runId} failed for ${data.taskIdentifier} [${data.version}.${data.environment}] ${data.error.message}`,
112+
subject: `[${data.organization}] Run ${data.runId} failed for ${data.taskIdentifier} [${
113+
data.version
114+
}.${data.environment}] ${formatErrorMessageForSubject(data.error.message)}`,
113115
component: <AlertRunFailureEmail {...data} />,
114116
};
115117
}
@@ -128,3 +130,12 @@ export class EmailClient {
128130
}
129131
}
130132
}
133+
134+
function formatErrorMessageForSubject(message?: string) {
135+
if (!message) {
136+
return "";
137+
}
138+
139+
const singleLine = message.replace(/[\r\n]+/g, " ");
140+
return singleLine.length > 30 ? singleLine.substring(0, 27) + "..." : singleLine;
141+
}

references/v3-catalog/trigger.config.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { ffmpeg, syncEnvVars } from "@trigger.dev/build/extensions/core";
77
import { puppeteer } from "@trigger.dev/build/extensions/puppeteer";
88
import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
99
import { emitDecoratorMetadata } from "@trigger.dev/build/extensions/typescript";
10-
import { pythonExtension } from "@trigger.dev/python/extension";
1110
import { defineConfig } from "@trigger.dev/sdk/v3";
1211

1312
export { handleError } from "./src/handleError.js";
@@ -87,7 +86,6 @@ export default defineConfig({
8786
value: secret.secretValue,
8887
}));
8988
}),
90-
pythonExtension(),
9189
puppeteer(),
9290
],
9391
external: ["re2"],

0 commit comments

Comments
 (0)