Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Await some rabbitmq methods, don't reset some config values on start

Browse Source
This commit is contained in:
Madeline 2022-11-06 18:59:31 +11:00
parent 4469acd390
commit 72faa449e0
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/bundle/Server.ts
View File

@ -31,20 +31,20 @@ async function main() {
await initDatabase();
await Config.init();
await BannedWords.init();
// only set endpointPublic, if not already set
await Config.set({
cdn: {
endpointClient: "${location.host}",
endpointPrivate: `http://localhost:${port}`,
},
gateway: {
endpointClient:
'${location.protocol === "https:" ? "wss://" : "ws://"}${location.host}',
endpointPrivate: `ws://localhost:${port}`,
...(!Config.get().gateway.endpointPublic && {
endpointPublic: `ws://localhost:${port}`,
}),
},
// // only set endpointPublic, if not already set
// await Config.set({
// cdn: {
// endpointClient: "${location.host}",
// endpointPrivate: `http://localhost:${port}`,
// },
// gateway: {
// endpointClient:
// '${location.protocol === "https:" ? "wss://" : "ws://"}${location.host}',
// endpointPrivate: `ws://localhost:${port}`,
// ...(!Config.get().gateway.endpointPublic && {
// endpointPublic: `ws://localhost:${port}`,
// }),
// },
// regions: {
// default: "fosscord",
// useDefaultAsOptimal: true,
@ -59,7 +59,7 @@ async function main() {
// },
// ],
// },
} as any);
// } as any);
//Sentry
if (Config.get().sentry.enabled) {

16
src/util/util/Event.ts
View File

@ -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;