diff options
Diffstat (limited to 'worker')
| -rw-r--r-- | worker/executor.ts | 3 | ||||
| -rwxr-xr-x | worker/scripts/checkout_ci.ts | 4 |
2 files changed, 4 insertions, 3 deletions
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<Job, LogMetricTraceSupplier>) => { 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<Job, LogMetricTraceSupplier>) => { .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(); }; // -- </job.exectuor> -- 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 = <FetchCodeJob>{ - 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)), ); }), ) |