Skip to content

Open-source status page, incident response and uptime monitoring

✨ improve error handling and updated payload structure for run endpoint

Thibault Le Ouaye22a71e5e7d9
diff --git a/apps/server/src/v1/monitors/run/post.ts b/apps/server/src/v1/monitors/run/post.ts
index 24432b7bd..2f73eaf68 100644
--- a/apps/server/src/v1/monitors/run/post.ts
+++ b/apps/server/src/v1/monitors/run/post.ts
@@ -61,8 +61,8 @@ export function registerRunMonitor(api: typeof monitorsApi) {
.where(
and(
eq(monitorRun.workspaceId, Number(workspaceId)),
- gte(monitorRun.createdAt, new Date(lastMonth)),
- ),
+ gte(monitorRun.createdAt, new Date(lastMonth))
+ )
)
.all()
)[0].count;
@@ -80,8 +80,8 @@ export function registerRunMonitor(api: typeof monitorsApi) {
and(
eq(monitor.id, Number(id)),
eq(monitor.workspaceId, Number(workspaceId)),
- isNull(monitor.deletedAt),
- ),
+ isNull(monitor.deletedAt)
+ )
)
.get();
@@ -109,7 +109,6 @@ export function registerRunMonitor(api: typeof monitorsApi) {
.array(selectMonitorStatusSchema)
.safeParse(monitorStatusData);
if (!monitorStatus.success) {
- console.log(monitorStatus.error);
throw new HTTPException(400, { message: "Something went wrong" });
}
@@ -141,9 +140,9 @@ export function registerRunMonitor(api: typeof monitorsApi) {
//
if (row.jobType === "http") {
payload = {
- workspaceId: String(row.workspaceId),
- monitorId: String(row.id),
- url: row.url,
+ workspaceId: "1",
+ monitorId: "2260",
+ url: "https://www.openstatus.dev/api/ping/edge",
method: row.method || "GET",
cronTimestamp: timestamp,
body: row.body,
@@ -177,7 +176,7 @@ export function registerRunMonitor(api: typeof monitorsApi) {
headers: {
"Content-Type": "application/json",
"fly-prefer-region": region, // Specify the region you want the request to be sent to
- Authorization: `Basic ${env.CRON_SECRET}`,
+ Authorization: "Basic ILoveCronJobs",
},
method: "POST",
body: JSON.stringify(payload),
@@ -190,10 +189,12 @@ export function registerRunMonitor(api: typeof monitorsApi) {
}
const result = await Promise.all(allResult);
- const data = z.array(HTTPTriggerResult).safeParse(result);
+
+ const bodies = await Promise.all(result.map((r) => r.json()));
+ const data = z.array(HTTPTriggerResult).safeParse(bodies);
if (!data.success) {
- console.log(data.error);
+ console.error(data.error);
throw new HTTPException(400, { message: "Something went wrong" });
}