Skip to content

Commit b171fde

Browse files
committed
Fix index failure completion override
1 parent 5ae3da6 commit b171fde

File tree

4 files changed

+32
-38
lines changed

4 files changed

+32
-38
lines changed

apps/kubernetes-provider/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@ const taskMonitor = new TaskMonitor({
540540
message: details.reason,
541541
stack: details.logs,
542542
},
543+
overrideCompletion: details.overrideCompletion,
543544
});
544545
} catch (error) {
545546
logger.error(error);

apps/webapp/app/v3/handleSocketIo.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ function createProviderNamespace(io: Server) {
267267
try {
268268
const service = new DeploymentIndexFailed();
269269

270-
await service.call(message.deploymentId, message.error);
270+
await service.call(message.deploymentId, message.error, message.overrideCompletion);
271271
} catch (e) {
272272
logger.error("Error while indexing", { error: e });
273273
}

packages/cli-v3/src/workers/prod/entry-point.ts

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
TaskRunFailedExecutionResult,
1010
WaitReason,
1111
} from "@trigger.dev/core/v3";
12-
import { ZodSocketConnection } from "@trigger.dev/core/v3/zodSocket";
12+
import { InferSocketMessageSchema, ZodSocketConnection } from "@trigger.dev/core/v3/zodSocket";
1313
import { HttpReply, getRandomPortNumber } from "@trigger.dev/core-apps/http";
1414
import { SimpleLogger } from "@trigger.dev/core-apps/logger";
1515
import { EXIT_CODE_ALREADY_HANDLED, EXIT_CODE_CHILD_NONZERO } from "@trigger.dev/core-apps/process";
@@ -629,6 +629,19 @@ class ProdWorker {
629629
}
630630

631631
if (process.env.INDEX_TASKS === "true") {
632+
const failIndex = (
633+
error: InferSocketMessageSchema<
634+
typeof ProdWorkerToCoordinatorMessages,
635+
"INDEXING_FAILED"
636+
>["error"]
637+
) => {
638+
socket.emit("INDEXING_FAILED", {
639+
version: "v1",
640+
deploymentId: this.deploymentId,
641+
error,
642+
});
643+
};
644+
632645
try {
633646
const taskResources = await this.#initializeWorker();
634647

@@ -655,15 +668,11 @@ class ProdWorker {
655668
tasks: e.tasks,
656669
});
657670

658-
socket.emit("INDEXING_FAILED", {
659-
version: "v1",
660-
deploymentId: this.deploymentId,
661-
error: {
662-
name: "TaskMetadataParseError",
663-
message: "There was an error parsing the task metadata",
664-
stack: JSON.stringify({ zodIssues: e.zodIssues, tasks: e.tasks }),
665-
stderr,
666-
},
671+
failIndex({
672+
name: "TaskMetadataParseError",
673+
message: "There was an error parsing the task metadata",
674+
stack: JSON.stringify({ zodIssues: e.zodIssues, tasks: e.tasks }),
675+
stderr,
667676
});
668677
} else if (e instanceof UncaughtExceptionError) {
669678
const error = {
@@ -675,11 +684,7 @@ class ProdWorker {
675684

676685
logger.error("uncaught exception", { originalError: error });
677686

678-
socket.emit("INDEXING_FAILED", {
679-
version: "v1",
680-
deploymentId: this.deploymentId,
681-
error,
682-
});
687+
failIndex(error);
683688
} else if (e instanceof Error) {
684689
const error = {
685690
name: e.name,
@@ -690,34 +695,22 @@ class ProdWorker {
690695

691696
logger.error("error", { error });
692697

693-
socket.emit("INDEXING_FAILED", {
694-
version: "v1",
695-
deploymentId: this.deploymentId,
696-
error,
697-
});
698+
failIndex(error);
698699
} else if (typeof e === "string") {
699700
logger.error("string error", { error: { message: e } });
700701

701-
socket.emit("INDEXING_FAILED", {
702-
version: "v1",
703-
deploymentId: this.deploymentId,
704-
error: {
705-
name: "Error",
706-
message: e,
707-
stderr,
708-
},
702+
failIndex({
703+
name: "Error",
704+
message: e,
705+
stderr,
709706
});
710707
} else {
711708
logger.error("unknown error", { error: e });
712709

713-
socket.emit("INDEXING_FAILED", {
714-
version: "v1",
715-
deploymentId: this.deploymentId,
716-
error: {
717-
name: "Error",
718-
message: "Unknown error",
719-
stderr,
720-
},
710+
failIndex({
711+
name: "Error",
712+
message: "Unknown error",
713+
stderr,
721714
});
722715
}
723716

packages/core/src/v3/schemas/messages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ export const ProviderToPlatformMessages = {
347347
stack: z.string().optional(),
348348
stderr: z.string().optional(),
349349
}),
350-
overrideCompletion: z.string().optional(),
350+
overrideCompletion: z.boolean().optional(),
351351
}),
352352
},
353353
};

0 commit comments

Comments
 (0)