From a275280eb59a48cca0b4023c43bc19a06002f3c6 Mon Sep 17 00:00:00 2001
From: "Kai A. Hiller" <V02460@gmail.com>
Date: Wed, 7 Aug 2019 12:15:58 -0400
Subject: [PATCH] Raise bridge errors in case of an unexpected error
Signed-off-by: Kai A. Hiller <V02460@gmail.com>
---
src/discordas.ts | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/discordas.ts b/src/discordas.ts
index 96ca2b6..5cd3cb6 100644
--- a/src/discordas.ts
+++ b/src/discordas.ts
@@ -33,7 +33,7 @@ import { Log } from "./log";
import "source-map-support/register";
import { MetricPeg, PrometheusBridgeMetrics } from "./metrics";
import { IMatrixEvent } from "./matrixtypes";
-import { isInstanceOfTypes } from "./util";
+import { wrapError, isInstanceOfTypes } from "./util";
const log = new Log("DiscordAS");
@@ -128,6 +128,12 @@ async function run(port: number, fileConfig: DiscordBridgeConfig) {
request.outcomeFrom(callbackResult);
} catch (err) {
logOnEventError(err);
+
+ // Raise bridge errors in case of an unexpected error, too.
+ if (!(err instanceof Unstable.EventNotHandledError)) {
+ err = wrapError(err, Unstable.InternalError);
+ }
+
request.reject(err);
} finally {
recordRequestOutcome(request);
--
GitLab