From 72faa449e048ad192b51de8fa1d49750b23c236c Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Sun, 6 Nov 2022 18:59:31 +1100
Subject: Await some rabbitmq methods, don't reset some config values on start

---
 src/util/util/Event.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/util')

diff --git a/src/util/util/Event.ts b/src/util/util/Event.ts
index c81de951..b7fddd3b 100644
--- a/src/util/util/Event.ts
+++ b/src/util/util/Event.ts
@@ -66,7 +66,7 @@ export async function listenEvent(
 	opts?: ListenEventOpts,
 ) {
 	if (RabbitMQ.connection) {
-		return rabbitListen(
+		return await rabbitListen(
 			// @ts-ignore
 			opts?.channel || RabbitMQ.channel,
 			event,
@@ -74,7 +74,7 @@ export async function listenEvent(
 			{ acknowledge: opts?.acknowledge },
 		);
 	} else if (process.env.EVENT_TRANSMISSION === "process") {
-		const cancel = () => {
+		const cancel = async () => {
 			process.removeListener("message", listener);
 			process.setMaxListeners(process.getMaxListeners() - 1);
 		};
@@ -92,7 +92,7 @@ export async function listenEvent(
 		return cancel;
 	} else {
 		const listener = (opts: any) => callback({ ...opts, cancel });
-		const cancel = () => {
+		const cancel = async () => {
 			events.removeListener(event, listener);
 			events.setMaxListeners(events.getMaxListeners() - 1);
 		};
@@ -115,13 +115,13 @@ async function rabbitListen(
 		autoDelete: true,
 	});
 
-	const cancel = () => {
-		channel.cancel(q.queue);
-		channel.unbindQueue(q.queue, id, "");
+	const cancel = async () => {
+		await channel.cancel(q.queue);
+		await channel.unbindQueue(q.queue, id, "");
 	};
 
-	channel.bindQueue(q.queue, id, "");
-	channel.consume(
+	await channel.bindQueue(q.queue, id, "");
+	await channel.consume(
 		q.queue,
 		(opts) => {
 			if (!opts) return;
-- 
cgit 1.4.1