Skip to content

Commit 0c65a0c

Browse files
committed
handle logMessage failing in ReportPoller timer
1 parent 21aabc8 commit 0c65a0c

File tree

1 file changed

+24
-8
lines changed

1 file changed

+24
-8
lines changed

src/report/ReportPoller.ts

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,12 @@ export class ReportPoller {
7070
"/_synapse/admin/v1/event_reports",
7171
{ from: this.from.toString() }
7272
);
73-
} catch (ex) {
74-
await this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to poll events: ${ex}`);
73+
} catch (ex1) {
74+
try {
75+
await this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to poll events: ${ex1}`);
76+
} catch (ex2) {
77+
// failed to log. what do?
78+
}
7579
return;
7680
}
7781

@@ -87,8 +91,12 @@ export class ReportPoller {
8791
"GET",
8892
`/_synapse/admin/v1/rooms/${report.room_id}/context/${report.event_id}?limit=1`
8993
)).event;
90-
} catch (ex) {
91-
this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to get context: ${ex}`);
94+
} catch (ex1) {
95+
try {
96+
this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to get context: ${ex1}`);
97+
} catch (ex2) {
98+
// failed to log. what do?
99+
}
92100
continue;
93101
}
94102

@@ -109,8 +117,12 @@ export class ReportPoller {
109117
this.from = response.next_token;
110118
try {
111119
await this.mjolnir.client.setAccountData(REPORT_POLL_EVENT_TYPE, { from: response.next_token });
112-
} catch (ex) {
113-
await this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to update progress: ${ex}`);
120+
} catch (ex1) {
121+
try {
122+
await this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to update progress: ${ex1}`);
123+
} catch (ex2) {
124+
// failed to log. what do?
125+
}
114126
}
115127
}
116128
}
@@ -120,8 +132,12 @@ export class ReportPoller {
120132

121133
try {
122134
await this.getAbuseReports()
123-
} catch (ex) {
124-
await this.mjolnir.logMessage(LogLevel.ERROR, "tryGetAbuseReports", `failed to get abuse reports: ${ex}`);
135+
} catch (ex1) {
136+
try {
137+
await this.mjolnir.logMessage(LogLevel.ERROR, "tryGetAbuseReports", `failed to get abuse reports: ${ex1}`);
138+
} catch (ex2) {
139+
// failed to log. what do?
140+
}
125141
}
126142

127143
this.schedulePoll();

0 commit comments

Comments
 (0)