xevion/bus-reminder
1
0
Fork 0
mirror of https://github.com/Xevion/bus-reminder.git synced 2026-01-31 08:23:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reformat monitor.ts, add logging calls

Browse Source
This commit is contained in:
Xevion
2023-09-05 10:43:04 -05:00
parent 43b0949a8e
commit 24b4b678a8
1 changed files with 71 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/monitor.ts
+16 -15
View File
@@ -1,5 +1,6 @@
import { env } from "@/env/server.mjs"; import { env } from '@/env/server.mjs';
import { z } from "zod"; import { z } from 'zod';
import logger from '@/logger';
const BASE_URL = `https://cronitor.link/p/${env.CRONITOR_ACCOUNT_ID}/${env.CRONITOR_JOB_ID}`; const BASE_URL = `https://cronitor.link/p/${env.CRONITOR_ACCOUNT_ID}/${env.CRONITOR_JOB_ID}`;
const parameterSchema = z.object({ const parameterSchema = z.object({
@@ -10,12 +11,12 @@ const parameterSchema = z.object({
.union([ .union([
z.object({ count: z.number() }), z.object({ count: z.number() }),
z.object({ duration: z.number() }), z.object({ duration: z.number() }),
z.object({ error_count: z.number() }), z.object({ error_count: z.number() })
]) ])
.optional(), .optional(),
series: z.string().optional(), series: z.string().optional(),
state: z.enum(["run", "complete", "fail", "ok"]).optional(), state: z.enum(['run', 'complete', 'fail', 'ok']).optional(),
status_code: z.number().int().optional(), status_code: z.number().int().optional()
}); });
function buildURL(parameters: z.infer<typeof parameterSchema>) { function buildURL(parameters: z.infer<typeof parameterSchema>) {
@@ -28,7 +29,7 @@ function buildURL(parameters: z.infer<typeof parameterSchema>) {
host, host,
message, message,
series, series,
state, state
}).filter(([, value]) => value != undefined)) }).filter(([, value]) => value != undefined))
url.searchParams.append(key, value!); url.searchParams.append(key, value!);
@@ -39,11 +40,11 @@ function buildURL(parameters: z.infer<typeof parameterSchema>) {
duration?: number; duration?: number;
error_count?: number; error_count?: number;
}; };
if (count != undefined) url.searchParams.append("metric", `count:${count}`); if (count != undefined) url.searchParams.append('metric', `count:${count}`);
else if (duration != undefined) else if (duration != undefined)
url.searchParams.append("metric", `duration:${duration}`); url.searchParams.append('metric', `duration:${duration}`);
else if (error_count != undefined) else if (error_count != undefined)
url.searchParams.append("metric", `error_count:${error_count}`); url.searchParams.append('metric', `error_count:${error_count}`);
} }
return url; return url;
@@ -67,8 +68,8 @@ export default async function monitorAsync<T = any>(
// Tell Cronitor that the job is running // Tell Cronitor that the job is running
const start = new Date(); const start = new Date();
const series = start.getTime().toString(); const series = start.getTime().toString();
await fetch(buildURL({ state: "run", series }).toString()); await fetch(buildURL({ state: 'run', series }).toString());
console.log("Cronitor: Job started"); logger.info('Cronitor: Job started');
// Execute the function, provide try/catch // Execute the function, provide try/catch
let result: T | undefined = undefined; let result: T | undefined = undefined;
@@ -78,20 +79,20 @@ export default async function monitorAsync<T = any>(
const duration = getDuration(start, new Date()); const duration = getDuration(start, new Date());
await fetch( await fetch(
buildURL({ buildURL({
state: "fail", state: 'fail',
series, series,
message: error instanceof Error ? error.message : undefined, message: error instanceof Error ? error.message : undefined,
metric: { duration }, metric: { duration }
}).toString() }).toString()
); );
throw error; throw error;
} }
// Tell Cronitor that the job is complete (success) // Tell Cronitor that the job is complete (success)
console.log("Cronitor: Job completed"); logger.info('Cronitor: Job completed');
const duration = getDuration(start, new Date()); const duration = getDuration(start, new Date());
await fetch( await fetch(
buildURL({ state: "complete", series, metric: { duration } }).toString() buildURL({ state: 'complete', series, metric: { duration } }).toString()
); );
return result as T; return result as T;