From 7d2c0a4aedad3c5e8a81bd19f4417aa4f9fb8360 Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Tue, 1 Jul 2025 10:49:40 -0700 Subject: Use correct fetch code props --- worker/executor.ts | 3 ++- worker/scripts/checkout_ci.ts | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'worker') diff --git a/worker/executor.ts b/worker/executor.ts index bfcbc37..47b337c 100644 --- a/worker/executor.ts +++ b/worker/executor.ts @@ -18,7 +18,7 @@ export const executeJob = (tJob: ITraceable) => { const metric = jobTypeMetric(tJob.get().type); return tJob .flatMap(TraceUtil.withMetricTrace(metric)) - .peek((tJob) => tJob.trace.trace(`let's do this little job ok!! ${tJob.get()}`)) + .peek((tJob) => tJob.trace.trace(`let's do this little job ok!! ${JSON.stringify(tJob.get())}`)) .map((tJob) => validateExecutionEntries(tJob.get().arguments) .mapLeft((badEntries) => { @@ -28,6 +28,7 @@ export const executeJob = (tJob: ITraceable) => { .flatMapAsync((args) => getStdout(tJob.move(tJob.get().type), { env: args })), ) .flatMapAsync(TraceUtil.promiseify(TraceUtil.traceResultingEither(metric))) + .peek(TraceUtil.promiseify(t => t.traceScope(() => LogLevel.DEBUG).trace.trace(JSON.stringify(t.get())))) .get(); }; // -- -- diff --git a/worker/scripts/checkout_ci.ts b/worker/scripts/checkout_ci.ts index 0a8b30d..0c6d92c 100755 --- a/worker/scripts/checkout_ci.ts +++ b/worker/scripts/checkout_ci.ts @@ -51,7 +51,7 @@ await LogMetricTraceable.ofLogTraceable(_logJob) tEitherJob.get().flatMapAsync((ciJob) => { const wd = getWorkingDirectoryForCiJob(ciJob); const fetchPackageJob = { - type: 'fetch_code.js', + type: 'fetch_code', arguments: { remoteUrl: ciJob.arguments.remote, checkout: ciJob.arguments.rev, @@ -62,7 +62,7 @@ await LogMetricTraceable.ofLogTraceable(_logJob) mkdir(wd, { recursive: true }) .then(() => process.chdir(wd)) .then(() => tEitherJob.move(fetchPackageJob).map(executeJob).get()) - .then(() => ciJob), + .then((e) => e.fold(err => { throw err; }, () => ciJob)), ); }), ) -- cgit v1.2.3-70-g09d2