Skip to content

Commit 7d64ee8

Browse files
authored
Clean up and enhance logging for messaging and calendar (#17498)
This PR reduces noise to signal ratio for messaging and calendar logging in production Impact would be faster queries and debugging
1 parent da6f1bb commit 7d64ee8

18 files changed

+52
-48
lines changed

packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/caldav/services/caldav-get-events.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class CalDavGetEventsService {
2323
>,
2424
syncCursor?: string,
2525
): Promise<GetCalendarEventsResponse> {
26-
this.logger.log(`Getting calendar events for ${connectedAccount.handle}`);
26+
this.logger.debug(`Getting calendar events for ${connectedAccount.handle}`);
2727

2828
try {
2929
const caldavCalendarClient =
@@ -46,7 +46,7 @@ export class CalDavGetEventsService {
4646
syncCursor: syncCursor ? JSON.parse(syncCursor) : undefined,
4747
});
4848

49-
this.logger.log(
49+
this.logger.debug(
5050
`Found ${result.events.length} calendar events for ${connectedAccount.handle}`,
5151
);
5252

packages/twenty-server/src/modules/calendar/calendar-event-import-manager/drivers/google-calendar/services/google-calendar-get-events.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export class GoogleCalendarGetEventsService {
108108
this.logger.error(
109109
`Calendar event import error for Google Calendar. status: ${error.response?.status}`,
110110
);
111-
this.logger.log(error);
111+
this.logger.error(error);
112112
const googleCalendarError = {
113113
code: error.response?.status,
114114
reason:

packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-event-import-exception-handler.service.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export class CalendarEventImportErrorHandlerService {
8585
calendarChannel: Pick<CalendarChannelWorkspaceEntity, 'id'>,
8686
workspaceId: string,
8787
): Promise<void> {
88-
this.logger.log(
88+
this.logger.debug(
8989
`CalendarChannelId: ${calendarChannel.id} - Sync cursor error, resetting and rescheduling`,
9090
);
9191

@@ -112,7 +112,7 @@ export class CalendarEventImportErrorHandlerService {
112112
);
113113

114114
const calendarEventImportException = new CalendarEventImportException(
115-
`Temporary error occurred ${CALENDAR_THROTTLE_MAX_ATTEMPTS} times while importing calendar events for calendar channel ${calendarChannel.id.slice(0, 5)}... in workspace ${workspaceId} with throttleFailureCount ${calendarChannel.throttleFailureCount}`,
115+
`Temporary error occurred ${CALENDAR_THROTTLE_MAX_ATTEMPTS} times while importing calendar events for calendar channel ${calendarChannel.id} in workspace ${workspaceId} with throttleFailureCount ${calendarChannel.throttleFailureCount}`,
116116
CalendarEventImportExceptionCode.UNKNOWN,
117117
);
118118

@@ -121,6 +121,8 @@ export class CalendarEventImportErrorHandlerService {
121121
{
122122
additionalData: {
123123
calendarChannelId: calendarChannel.id,
124+
syncStep,
125+
throttleFailureCount: calendarChannel.throttleFailureCount,
124126
},
125127
workspace: {
126128
id: workspaceId,
@@ -194,17 +196,17 @@ export class CalendarEventImportErrorHandlerService {
194196
);
195197

196198
const calendarEventImportException = new CalendarEventImportException(
197-
`Unknown error importing calendar events for calendar channel ${calendarChannel.id.slice(0, 5)}... in workspace ${workspaceId}: ${exception.message}`,
199+
`Unknown error importing calendar events for calendar channel ${calendarChannel.id} in workspace ${workspaceId}: ${exception.message}`,
198200
CalendarEventImportExceptionCode.UNKNOWN,
199201
);
200202

201-
this.logger.log(exception);
203+
this.logger.error(exception);
202204
this.exceptionHandlerService.captureExceptions(
203205
[calendarEventImportException],
204206
{
205207
additionalData: {
206208
calendarChannelId: calendarChannel.id,
207-
exception,
209+
exceptionMessage: exception.message,
208210
},
209211
workspace: {
210212
id: workspaceId,

packages/twenty-server/src/modules/calendar/calendar-event-import-manager/services/calendar-fetch-events.service.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ export class CalendarFetchEventsService {
4141
connectedAccount: ConnectedAccountWorkspaceEntity,
4242
workspaceId: string,
4343
): Promise<void> {
44+
this.logger.log(
45+
`WorkspaceId: ${workspaceId}, CalendarChannelId: ${calendarChannel.id} - Fetching calendar events`,
46+
);
47+
4448
await this.calendarChannelSyncStatusService.markAsCalendarEventListFetchOngoing(
4549
[calendarChannel.id],
4650
workspaceId,
@@ -141,10 +145,9 @@ export class CalendarFetchEventsService {
141145
);
142146
}
143147
} catch (error) {
144-
this.logger.log(
145-
`Calendar event fetch error for workspace ${workspaceId} and calendar channel ${calendarChannel.id}`,
148+
this.logger.error(
149+
`WorkspaceId: ${workspaceId}, CalendarChannelId: ${calendarChannel.id} - Calendar event fetch error: ${error.message}`,
146150
);
147-
this.logger.error(error);
148151
await this.calendarEventImportErrorHandlerService.handleDriverException(
149152
error,
150153
CalendarEventImportSyncStep.CALENDAR_EVENT_LIST_FETCH,

packages/twenty-server/src/modules/messaging/message-cleaner/services/messaging-message-cleaner.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export class MessagingMessageCleanerService {
8888
continue;
8989
}
9090

91-
this.logger.log(
91+
this.logger.debug(
9292
`WorkspaceId: ${workspaceId} Deleting ${orphanMessages.length} orphan messages`,
9393
);
9494

@@ -109,7 +109,7 @@ export class MessagingMessageCleanerService {
109109
continue;
110110
}
111111

112-
this.logger.log(
112+
this.logger.debug(
113113
`WorkspaceId: ${workspaceId} Deleting ${orphanMessageThreads.length} orphan message threads`,
114114
);
115115

@@ -171,7 +171,7 @@ export class MessagingMessageCleanerService {
171171
workspaceId: string,
172172
transactionManager?: WorkspaceEntityManager,
173173
) => {
174-
this.logger.log(
174+
this.logger.debug(
175175
`WorkspaceId: ${workspaceId} Deleting ${ids.length} messages from message cleaner`,
176176
);
177177
await messageRepository.delete(ids, transactionManager);

packages/twenty-server/src/modules/messaging/message-folder-manager/drivers/gmail/services/gmail-get-all-folders.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export class GmailGetAllFoldersService implements MessageFolderDriver {
100100
});
101101
}
102102

103-
this.logger.log(
103+
this.logger.debug(
104104
`Found ${folders.length} folders for Gmail account ${connectedAccount.handle}`,
105105
);
106106

packages/twenty-server/src/modules/messaging/message-folder-manager/drivers/microsoft/services/microsoft-get-all-folders.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export class MicrosoftGetAllFoldersService implements MessageFolderDriver {
9999
});
100100
}
101101

102-
this.logger.log(
102+
this.logger.debug(
103103
`Found ${folderInfos.length} folders for Microsoft account ${connectedAccount.handle}`,
104104
);
105105

packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-get-messages.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export class ImapGetMessagesService {
107107
client: ImapFlow,
108108
connectedAccount: ConnectedAccount,
109109
): Promise<MessageWithParticipants[]> {
110-
this.logger.log(
110+
this.logger.debug(
111111
`Fetching ${messageUids.length} messages from ${folderPath}`,
112112
);
113113
const startTime = Date.now();
@@ -146,7 +146,7 @@ export class ImapGetMessagesService {
146146
);
147147
}
148148

149-
this.logger.log(
149+
this.logger.debug(
150150
`Parsed ${messages.length}/${results.length} messages from ${folderPath} in ${Date.now() - startTime}ms`,
151151
);
152152

packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-sync.service.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class ImapSyncService {
6666
const { maxUid } = mailboxState;
6767

6868
if (canUseQresync(client, previousCursor, mailboxState)) {
69-
this.logger.log(`Using QRESYNC for folder ${folderPath}`);
69+
this.logger.debug(`Using QRESYNC for folder ${folderPath}`);
7070

7171
try {
7272
return await this.fetchWithQresync(
@@ -81,7 +81,7 @@ export class ImapSyncService {
8181
}
8282
}
8383

84-
this.logger.log(`Using UID range fetch for folder ${folderPath}`);
84+
this.logger.debug(`Using UID range fetch for folder ${folderPath}`);
8585

8686
return this.fetchWithUidRange(client, lastSyncedUid, maxUid);
8787
}
@@ -122,7 +122,7 @@ export class ImapSyncService {
122122
return [];
123123
}
124124

125-
this.logger.log(`QRESYNC found ${uids.length} new/modified messages`);
125+
this.logger.debug(`QRESYNC found ${uids.length} new/modified messages`);
126126

127127
return uids;
128128
}

packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-message-list-fetch-error-handler.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class MicrosoftMessageListFetchErrorHandler {
1515

1616
// eslint-disable-next-line @typescript-eslint/no-explicit-any
1717
public handleError(error: any): void {
18-
this.logger.log(`Error fetching message list: ${JSON.stringify(error)}`);
18+
this.logger.error(`Error fetching message list: ${JSON.stringify(error)}`);
1919

2020
const networkError = this.microsoftNetworkErrorHandler.handleError(error);
2121

0 commit comments

Comments
 (0)