Skip to content

Commit 83db5e2

Browse files
committed
handle logMessage failing in ReportPoller timer
1 parent 64c26e5 commit 83db5e2

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
@@ -74,8 +74,12 @@ export class ReportPoller {
7474
from: this.from.toString()
7575
}
7676
);
77-
} catch (ex) {
78-
await this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to poll events: ${ex}`);
77+
} catch (ex1) {
78+
try {
79+
await this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to poll events: ${ex1}`);
80+
} catch (ex2) {
81+
// failed to log. what do?
82+
}
7983
return;
8084
}
8185

@@ -91,8 +95,12 @@ export class ReportPoller {
9195
"GET",
9296
`/_synapse/admin/v1/rooms/${report.room_id}/context/${report.event_id}?limit=1`
9397
)).event;
94-
} catch (ex) {
95-
this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to get context: ${ex}`);
98+
} catch (ex1) {
99+
try {
100+
this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to get context: ${ex1}`);
101+
} catch (ex2) {
102+
// failed to log. what do?
103+
}
96104
continue;
97105
}
98106

@@ -113,8 +121,12 @@ export class ReportPoller {
113121
this.from = response.next_token;
114122
try {
115123
await this.mjolnir.client.setAccountData(REPORT_POLL_EVENT_TYPE, { from: response.next_token });
116-
} catch (ex) {
117-
await this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to update progress: ${ex}`);
124+
} catch (ex1) {
125+
try {
126+
await this.mjolnir.logMessage(LogLevel.ERROR, "getAbuseReports", `failed to update progress: ${ex1}`);
127+
} catch (ex2) {
128+
// failed to log. what do?
129+
}
118130
}
119131
}
120132
}
@@ -124,8 +136,12 @@ export class ReportPoller {
124136

125137
try {
126138
await this.getAbuseReports()
127-
} catch (ex) {
128-
await this.mjolnir.logMessage(LogLevel.ERROR, "tryGetAbuseReports", `failed to get abuse reports: ${ex}`);
139+
} catch (ex1) {
140+
try {
141+
await this.mjolnir.logMessage(LogLevel.ERROR, "tryGetAbuseReports", `failed to get abuse reports: ${ex1}`);
142+
} catch (ex2) {
143+
// failed to log. what do?
144+
}
129145
}
130146

131147
this.schedulePoll();

0 commit comments

Comments
 (0)