xevion/bus-reminder
1
0
Fork 0
mirror of https://github.com/Xevion/bus-reminder.git synced 2025-12-06 11:14:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add additional logging into cron, reformat

Browse Source
This commit is contained in:
Xevion
2023-09-05 15:26:36 -05:00
parent cada397210
commit 77690b37e7
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/pages/api/cron.ts
View File

@@ -1,18 +1,18 @@
import { getMatchingTime } from '@/timing';
import type { NextApiRequest, NextApiResponse } from 'next';
import { getDistance } from '@/location';
import monitorAsync from '@/monitor';
import { sendNotification } from '@/notify';
import { import {
checkIdentifier, checkIdentifier,
fetchConfiguration, fetchConfiguration,
getKey, getKey,
markIdentifier markIdentifier
} from '@/db'; } from '@/db';
import { localNow } from '@/utils/timezone'; import { getDistance } from '@/location';
import logger from '@/logger'; import logger from '@/logger';
import monitorAsync from '@/monitor';
import { sendNotification } from '@/notify';
import { getMatchingTime } from '@/timing';
import { parseBoolean } from '@/utils/client'; import { parseBoolean } from '@/utils/client';
import { unauthorized } from '@/utils/server'; import { unauthorized } from '@/utils/server';
import { localNow } from '@/utils/timezone';
import type { NextApiRequest, NextApiResponse } from 'next';
type ResponseData = { type ResponseData = {
diff: number; diff: number;
@@ -53,7 +53,10 @@ export default async function handler(
const matching = await getMatchingTime(config, now); const matching = await getMatchingTime(config, now);
// No matching time - no notification to send. // No matching time - no notification to send.
if (matching == null) return { status: 'no-matching-time' }; if (matching == null) {
logger.info('No matching time.', { time: now });
return { status: 'no-matching-time' };
}
// Get the key for this notification (name + time) // Get the key for this notification (name + time)
const key = getKey(matching.name, now); const key = getKey(matching.name, now);
@@ -68,11 +71,13 @@ export default async function handler(
// TODO: Properly draw from environment MAX_DISTANCE // TODO: Properly draw from environment MAX_DISTANCE
const distance = distanceResult.value; const distance = distanceResult.value;
if (distance > 280) if (distance > 280) {
logger.debug('Distance is out of range.', { distance });
return { return {
status: 'out-of-range', status: 'out-of-range',
identifier identifier
}; };
}
// Check if I have already been notified // Check if I have already been notified
const marked = await checkIdentifier(key); const marked = await checkIdentifier(key);
@@ -83,6 +88,7 @@ export default async function handler(
}; };
// Send notification, mark (expire in 1 month) // Send notification, mark (expire in 1 month)
logger.info('Sending notification, marking identifier.', { identifier });
await sendNotification(`${matching.message} (${matching.name})`); await sendNotification(`${matching.message} (${matching.name})`);
await markIdentifier(key, true, 60 * 60 * 24 * 31); await markIdentifier(key, true, 60 * 60 * 24 * 31);
@@ -93,7 +99,10 @@ export default async function handler(
logger.debug('Evaluating cron...'); logger.debug('Evaluating cron...');
let result; let result;
if (process.env.NODE_ENV === 'production' && parseBoolean(req.query.report ?? 'true')) if (
process.env.NODE_ENV === 'production' &&
parseBoolean(req.query.report ?? 'true')
)
result = await monitorAsync(innerFunction); result = await monitorAsync(innerFunction);
else result = await innerFunction(); else result = await innerFunction();

2
src/timing.ts
View File

@@ -1,5 +1,5 @@
import { z } from 'zod';
import { intersection } from '@/sets'; import { intersection } from '@/sets';
import { z } from 'zod';
type ParsedTime = { type ParsedTime = {
hours: number; hours: number;