rearrange

autoblocksai · Mar 5, 2024 · 1a3481a · 1a3481a
1 parent 4028ca5
commit 1a3481a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/src/handlers/testing/exec/emitter.ts b/src/handlers/testing/exec/emitter.ts
@@ -12,7 +12,7 @@ export enum EventName {
 
 // Zod schemas for event data
 const zConsoleLogSchema = z.object({
- ctx: z.enum(['cmd', 'cli', 'cli-server']),
+ ctx: z.enum(['cmd', 'cli']),
  level: z.enum(['debug', 'info', 'warn', 'error']),
  message: z.string(),
 });

diff --git a/src/handlers/testing/exec/index.ts b/src/handlers/testing/exec/index.ts
@@ -140,13 +140,25 @@ class RunManager {
  async handleEndRun(args: { testExternalId: string }): Promise<void> {
  emitter.emit(EventName.RUN_ENDED, { testExternalId: args.testExternalId });
  const runId = this.currentRunId({ testExternalId: args.testExternalId });
- await this.post(`/runs/${runId}/end`);
- delete this.testExternalIdToRunId[args.testExternalId];
  if (this.ciContext) {
- await commentOnPullRequest({
- context: this.ciContext,
- evaluations: this.evaluations,
- });
+ try {
+ await commentOnPullRequest({
+ context: this.ciContext,
+ evaluations: this.evaluations,
+ });
+ } catch (err) {
+ emitter.emit(EventName.CONSOLE_LOG, {
+ ctx: 'cli',
+ level: 'error',
+ message: `Failed to comment on PR: ${err}`,
+ });
+ }
+ }
+
+ try {
+ await this.post(`/runs/${runId}/end`);
+ } finally {
+ delete this.testExternalIdToRunId[args.testExternalId];
  }
  }
 
@@ -319,7 +331,7 @@ function createHonoApp(runManager: RunManager): Hono {
 
  app.onError((err, c) => {
  emitter.emit(EventName.CONSOLE_LOG, {
- ctx: 'cli-server',
+ ctx: 'cli',
  level: 'error',
  message: `${c.req.method} ${c.req.path}: ${err.message}`,
  });
@@ -332,7 +344,7 @@ function createHonoApp(runManager: RunManager): Hono {
  ) => {
  if (!result.success) {
  emitter.emit(EventName.CONSOLE_LOG, {
- ctx: 'cli-server',
+ ctx: 'cli',
  level: 'error',
  message: `${c.req.method} ${c.req.path}: ${result.error}`,
  });
@@ -558,7 +570,7 @@ export async function exec(args: {
  const serverAddress = `http://localhost:${addressInfo.port}`;
 
  emitter.emit(EventName.CONSOLE_LOG, {
- ctx: 'cli-server',
+ ctx: 'cli',
  level: 'info',
  message: `Listening on ${serverAddress}`,
  });

diff --git a/src/handlers/testing/exec/util/net.ts b/src/handlers/testing/exec/util/net.ts
@@ -19,7 +19,7 @@ export async function findAvailablePort(args: {
  if ((err as { code?: string } | undefined)?.code === 'EADDRINUSE') {
  const nextPort = port + 1;
  emitter.emit(EventName.CONSOLE_LOG, {
- ctx: 'cli-server',
+ ctx: 'cli',
  level: 'info',
  message: `Port ${port} is in use, trying port ${nextPort}...`,
  });