natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix delivery handling
ci/woodpecker/tag/ociImageTag Pipeline was successful Details

This commit is contained in:
Natty 2024-12-19 20:16:05 +01:00
parent c9feae3a28
commit 96093d515e
Signed by: natty
GPG Key ID: BF6CB659ADEE60EC
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/backend/src/mag/rpc-client.ts
View File

@ -132,6 +132,7 @@ async function rpcCall<D, T>(method: string, data: D): Promise<T> {
const timeout = setTimeout(() => { const timeout = setTimeout(() => {
client.off("close", clearAndReject); client.off("close", clearAndReject);
client.off("error", clearAndReject); client.off("error", clearAndReject);
client.removeAllListeners(`mag-data:${currentSerial}`);
reject(new Error("Promise timeout")) reject(new Error("Promise timeout"))
}, 60000); }, 60000);

2
packages/backend/src/queue/processors/deliver.ts
View File

@ -24,6 +24,8 @@ export default async (job: Bull.Job<DeliverJobData>) => {
const puny = toPuny(host); const puny = toPuny(host);
// Drop old deliveries
if (typeof job.data.content !== "string") return "skip";
if (await shouldSkipInstance(puny)) return "skip"; if (await shouldSkipInstance(puny)) return "skip";
try { try {