schiwagoa/tianji
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: improve logger and test case

Browse Source
This commit is contained in:
moonrailgun 2024-07-20 02:55:55 +08:00
parent 6e68a8044d
commit 9796d42846
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/app.ts
View File

@ -81,9 +81,10 @@ app.use('/*', (req, res, next) => {
app.use(express.static('public')); app.use(express.static('public'));
// fallback // fallback
const webEntry = path.join(process.cwd(), 'public', 'index.html');
app.use('/*', (req, res) => { app.use('/*', (req, res) => {
if (req.method === 'GET' && req.accepts('html')) { if (req.method === 'GET' && req.accepts('html')) {
res.sendFile(path.join(process.cwd(), 'public', 'index.html')); res.sendFile(webEntry);
} }
}); });

9
src/server/model/feed/event.ts
View File

@ -59,7 +59,7 @@ export async function createFeedEvent(
export async function sendFeedEventsNotify( export async function sendFeedEventsNotify(
channel: Pick< channel: Pick<
z.infer<typeof FeedChannelModelSchema>, z.infer<typeof FeedChannelModelSchema>,
'name' | 'notifyFrequency' 'id' | 'name' | 'notifyFrequency'
> & { > & {
notifications: z.infer<typeof NotificationModelSchema>[]; notifications: z.infer<typeof NotificationModelSchema>[];
}, },
@ -95,7 +95,12 @@ export async function sendFeedEventsNotify(
await Promise.all( await Promise.all(
channel.notifications.map((notification) => channel.notifications.map((notification) =>
sendNotification(notification, 'Feed Report', eventTokens).catch((err) => sendNotification(notification, 'Feed Report', eventTokens).catch((err) =>
logger.error('[Notification] sendFeedEventsNotify', err) logger.error(
'[Notification] sendFeedEventsNotify',
channel.id,
notification.id,
err
)
) )
) )
); );

4
src/server/router/__test__/telemetry.test.ts
View File

@ -11,7 +11,7 @@ describe('telemetry router', () => {
const telemetry = await createTestTelemetry(workspace.id); const telemetry = await createTestTelemetry(workspace.id);
const { status } = await app.get( const { status } = await app.get(
`/telemetry/${workspace.id}/${telemetry.id}.svg` `/telemetry/${workspace.id}/${telemetry.id}.gif`
); );
expect(status).toBe(200); expect(status).toBe(200);
@ -22,7 +22,7 @@ describe('telemetry router', () => {
const telemetry = await createTestTelemetry(workspace.id); const telemetry = await createTestTelemetry(workspace.id);
const { status } = await app.get( const { status } = await app.get(
`/telemetry/${workspace.id}/${telemetry.id}.svg?name=tianji-oss&url=http://localhost:10000&v=1.8.2` `/telemetry/${workspace.id}/${telemetry.id}.gif?name=tianji-oss&url=https://google.com&v=1.8.2`
); );
expect(status).toBe(200); expect(status).toBe(200);