use fastify logger

This commit is contained in:
Carl-Gerhard Lindesvärd
2024-02-28 17:05:48 +01:00
parent eb03860daf
commit 888ede680e

View File

@@ -1,5 +1,4 @@
import { isBot } from '@/bots'; import { isBot } from '@/bots';
import { logInfo } from '@/utils/logger';
import { getClientIp, parseIp } from '@/utils/parseIp'; import { getClientIp, parseIp } from '@/utils/parseIp';
import { getReferrerWithQuery, parseReferrer } from '@/utils/parseReferrer'; import { getReferrerWithQuery, parseReferrer } from '@/utils/parseReferrer';
import { isUserAgentSet, parseUserAgent } from '@/utils/parseUserAgent'; import { isUserAgentSet, parseUserAgent } from '@/utils/parseUserAgent';
@@ -189,17 +188,17 @@ export async function postEvent(
!sessionEndJobCurrentDeviceId && !sessionEndJobPreviousDeviceId; !sessionEndJobCurrentDeviceId && !sessionEndJobPreviousDeviceId;
if (sessionEndJobCurrentDeviceId && !sessionEndJobPreviousDeviceId) { if (sessionEndJobCurrentDeviceId && !sessionEndJobPreviousDeviceId) {
logInfo('found session current'); request.log.info({}, 'found session current');
deviceId = currentDeviceId; deviceId = currentDeviceId;
const diff = Date.now() - sessionEndJobCurrentDeviceId.timestamp; const diff = Date.now() - sessionEndJobCurrentDeviceId.timestamp;
sessionEndJobCurrentDeviceId.changeDelay(diff + SESSION_END_TIMEOUT); sessionEndJobCurrentDeviceId.changeDelay(diff + SESSION_END_TIMEOUT);
} else if (!sessionEndJobCurrentDeviceId && sessionEndJobPreviousDeviceId) { } else if (!sessionEndJobCurrentDeviceId && sessionEndJobPreviousDeviceId) {
logInfo('found session previous'); request.log.info({}, 'found session previous');
deviceId = previousDeviceId; deviceId = previousDeviceId;
const diff = Date.now() - sessionEndJobPreviousDeviceId.timestamp; const diff = Date.now() - sessionEndJobPreviousDeviceId.timestamp;
sessionEndJobPreviousDeviceId.changeDelay(diff + SESSION_END_TIMEOUT); sessionEndJobPreviousDeviceId.changeDelay(diff + SESSION_END_TIMEOUT);
} else { } else {
logInfo('new session with current'); request.log.info({}, 'new session with current');
deviceId = currentDeviceId; deviceId = currentDeviceId;
// Queue session end // Queue session end
eventsQueue.add( eventsQueue.add(
@@ -217,19 +216,22 @@ export async function postEvent(
); );
} }
logInfo('incoming event', { request.log.info(
ip, {
origin, ip,
ua, origin,
uaInfo, ua,
referrer, uaInfo,
profileId, referrer,
projectId, profileId,
deviceId, projectId,
bot, deviceId,
geo, bot,
events, geo,
}); events,
},
'incoming event'
);
const payload: Omit<IServiceCreateEventPayload, 'id'> = { const payload: Omit<IServiceCreateEventPayload, 'id'> = {
name: body.name, name: body.name,
@@ -275,10 +277,13 @@ export async function postEvent(
if (payload.name === 'screen_view') { if (payload.name === 'screen_view') {
if (duration < 0) { if (duration < 0) {
logInfo('duration is wrong', { request.log.info(
prevEvent, {
payload, prevEvent,
}); payload,
},
'duration is wrong'
);
} }
await job.updateData({ await job.updateData({
type: 'createEvent', type: 'createEvent',
@@ -307,7 +312,7 @@ export async function postEvent(
options.jobId = `event:${projectId}:${deviceId}:${Date.now()}`; options.jobId = `event:${projectId}:${deviceId}:${Date.now()}`;
} }
logInfo('queue event', payload); request.log.info(payload, 'queue event');
// Queue current event // Queue current event
eventsQueue.add( eventsQueue.add(
'event', 'event',