fix: await queue push

opensumi · Jan 30, 2024 · 8f02d44 · 8f02d44
1 parent fa190d9
commit 8f02d44
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/github/handler.ts b/src/github/handler.ts
@@ -146,11 +146,14 @@ export async function webhookHandler(
         payload: payload,
       };
       if (useQueue) {
-        logger.info('send to queue');
-        Environment.instance().Queue.send({
+        const queueItem = {
           botId,
           type,
           data: webhookEvent,
+        };
+        logger.info('send to queue', queueItem);
+        await Environment.instance().Queue.send(queueItem, {
+          contentType: 'json',
         });
       } else {
         execContext.waitUntil(webhooks.receive(webhookEvent));

diff --git a/src/queue/index.ts b/src/queue/index.ts
@@ -36,6 +36,6 @@ export class QueueConsumer<T> {
 export const createConsumer = () => {
   const consumer = new QueueConsumer<TQueueMessage>();
   consumer.addWorker('github-app', new GitHubAppWorker());
-  // consumer.addWorker('github-webhook', githubWebhookWorker);
+  // consumer.addWorker('github-webhook', new GitHubWebHookWorker());
   return consumer;
 };
diff --git a/src/runtime/cfworker/index.ts b/src/runtime/cfworker/index.ts
@@ -5,6 +5,7 @@ import Environment from '@/env';
 import { createConsumer } from '@/queue';
 import { TQueueMessage } from '@/queue/types';
 import { RequiredField } from '@/types';
+import { Logger } from '@/utils/logger';
 
 const app = new Hono<{ Bindings: IRuntimeEnv }>() as THono;
 
@@ -20,6 +21,7 @@ export default {
     env: IRuntimeEnv,
     ctx: ExecutionContext,
   ) {
+    const logger = Logger.instance();
     Environment.from('cfworker', env);
 
     const consumer = createConsumer();
@@ -29,11 +31,11 @@ export default {
     ctx.waitUntil(
       consumer
         .runAndWait()
-        .then(() => {
-          console.log('queue done');
+        .then((res) => {
+          logger.info('queue done', res);
         })
         .catch((err) => {
-          console.log('queue error', err);
+          logger.error('queue error', err);
         }),
     );
   },