@lage-run/scheduler 0.3.3 → 0.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.json +22 -1
- package/CHANGELOG.md +11 -2
- package/lib/runners/WorkerRunner.d.ts +4 -4
- package/lib/runners/WorkerRunner.js +15 -38
- package/lib/runners/WorkerRunner.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,28 @@
|
|
|
2
2
|
"name": "@lage-run/scheduler",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "Sat, 17 Sep 2022
|
|
5
|
+
"date": "Sat, 17 Sep 2022 20:20:38 GMT",
|
|
6
|
+
"tag": "@lage-run/scheduler_v0.3.4",
|
|
7
|
+
"version": "0.3.4",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "ken@gizzar.com",
|
|
12
|
+
"package": "@lage-run/scheduler",
|
|
13
|
+
"commit": "425dc73ad81ce184a80ec2efcc10aecb0c569b40",
|
|
14
|
+
"comment": "Fixing logging in workerpools to not be out of order"
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
"author": "beachball",
|
|
18
|
+
"package": "@lage-run/scheduler",
|
|
19
|
+
"comment": "Bump @lage-run/worker-threads-pool to v0.1.2",
|
|
20
|
+
"commit": "425dc73ad81ce184a80ec2efcc10aecb0c569b40"
|
|
21
|
+
}
|
|
22
|
+
]
|
|
23
|
+
}
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
"date": "Sat, 17 Sep 2022 01:09:34 GMT",
|
|
6
27
|
"tag": "@lage-run/scheduler_v0.3.3",
|
|
7
28
|
"version": "0.3.3",
|
|
8
29
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,21 @@
|
|
|
1
1
|
# Change Log - @lage-run/scheduler
|
|
2
2
|
|
|
3
|
-
This log was last generated on Sat, 17 Sep 2022
|
|
3
|
+
This log was last generated on Sat, 17 Sep 2022 20:20:38 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.3.4
|
|
8
|
+
|
|
9
|
+
Sat, 17 Sep 2022 20:20:38 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- Fixing logging in workerpools to not be out of order (ken@gizzar.com)
|
|
14
|
+
- Bump @lage-run/worker-threads-pool to v0.1.2
|
|
15
|
+
|
|
7
16
|
## 0.3.3
|
|
8
17
|
|
|
9
|
-
Sat, 17 Sep 2022 01:09:
|
|
18
|
+
Sat, 17 Sep 2022 01:09:34 GMT
|
|
10
19
|
|
|
11
20
|
### Patches
|
|
12
21
|
|
|
@@ -3,7 +3,7 @@ import { WorkerPool } from "@lage-run/worker-threads-pool";
|
|
|
3
3
|
import type { AbortSignal } from "abort-controller";
|
|
4
4
|
import type { Logger } from "@lage-run/logger";
|
|
5
5
|
import type { Target, TargetConfig } from "@lage-run/target-graph";
|
|
6
|
-
import type {
|
|
6
|
+
import type { TargetRunner } from "../types/TargetRunner";
|
|
7
7
|
import type { Worker } from "worker_threads";
|
|
8
8
|
export interface WorkerRunnerOptions {
|
|
9
9
|
logger: Logger;
|
|
@@ -55,7 +55,7 @@ export declare class WorkerRunner implements TargetRunner {
|
|
|
55
55
|
constructor(options: WorkerRunnerOptions);
|
|
56
56
|
getPoolOptions(target: Target): PoolOptions;
|
|
57
57
|
ensurePool(poolOptions: PoolOptions): WorkerPool;
|
|
58
|
-
captureStream(target: Target, worker: Worker
|
|
59
|
-
run(target: Target, abortSignal?: AbortSignal
|
|
60
|
-
cleanup(): void
|
|
58
|
+
captureStream(target: Target, worker: Worker): () => void;
|
|
59
|
+
run(target: Target, abortSignal?: AbortSignal): Promise<void>;
|
|
60
|
+
cleanup(): Promise<void>;
|
|
61
61
|
}
|
|
@@ -84,44 +84,21 @@ class WorkerRunner {
|
|
|
84
84
|
}
|
|
85
85
|
return this.pools[id];
|
|
86
86
|
}
|
|
87
|
-
captureStream(target, worker
|
|
87
|
+
captureStream(target, worker) {
|
|
88
88
|
const { logger } = this.options;
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
const
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
// pass
|
|
97
|
-
},
|
|
98
|
-
};
|
|
99
|
-
if (stdout) {
|
|
100
|
-
if (captureStreams.stdout) {
|
|
101
|
-
stdout = stdout.pipe(captureStreams.stdout);
|
|
102
|
-
}
|
|
103
|
-
releaseStreams.stdout = logger.stream(logger_1.LogLevel.verbose, stdout, { target, tid: worker.threadId });
|
|
104
|
-
}
|
|
105
|
-
if (stderr) {
|
|
106
|
-
if (captureStreams.stderr) {
|
|
107
|
-
stderr = stderr.pipe(captureStreams.stderr);
|
|
108
|
-
}
|
|
109
|
-
releaseStreams.stderr = logger.stream(logger_1.LogLevel.verbose, stderr, { target, tid: worker.threadId });
|
|
110
|
-
}
|
|
89
|
+
const stdout = worker.stdout;
|
|
90
|
+
const stderr = worker.stderr;
|
|
91
|
+
const onData = (data) => logger.log(logger_1.LogLevel.info, data, { target });
|
|
92
|
+
stdout.setEncoding("utf-8");
|
|
93
|
+
stdout.on("data", onData);
|
|
94
|
+
stderr.setEncoding("utf-8");
|
|
95
|
+
stderr.on("data", onData);
|
|
111
96
|
return () => {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
captureStreams.stdout.destroy();
|
|
115
|
-
}
|
|
116
|
-
if (captureStreams.stderr && stderr) {
|
|
117
|
-
stderr.unpipe(captureStreams.stderr);
|
|
118
|
-
captureStreams.stderr.destroy();
|
|
119
|
-
}
|
|
120
|
-
releaseStreams.stdout();
|
|
121
|
-
releaseStreams.stderr();
|
|
97
|
+
stdout.off("data", onData);
|
|
98
|
+
stderr.off("data", onData);
|
|
122
99
|
};
|
|
123
100
|
}
|
|
124
|
-
async run(target, abortSignal
|
|
101
|
+
async run(target, abortSignal) {
|
|
125
102
|
if (abortSignal) {
|
|
126
103
|
if (abortSignal.aborted) {
|
|
127
104
|
return;
|
|
@@ -136,14 +113,14 @@ class WorkerRunner {
|
|
|
136
113
|
const pool = this.ensurePool(poolOptions);
|
|
137
114
|
let cleanupStreams;
|
|
138
115
|
await pool.exec({ target }, (worker) => {
|
|
139
|
-
cleanupStreams = this.captureStream(target, worker
|
|
140
|
-
}, (
|
|
116
|
+
cleanupStreams = this.captureStream(target, worker);
|
|
117
|
+
}, () => {
|
|
141
118
|
cleanupStreams();
|
|
142
119
|
});
|
|
143
120
|
}
|
|
144
|
-
cleanup() {
|
|
121
|
+
async cleanup() {
|
|
145
122
|
for (const pool of Object.values(this.pools)) {
|
|
146
|
-
pool.close();
|
|
123
|
+
await pool.close();
|
|
147
124
|
}
|
|
148
125
|
}
|
|
149
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkerRunner.js","sourceRoot":"","sources":["../../src/runners/WorkerRunner.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA4C;AAC5C,uEAA2D;AAC3D,4CAAoB;AAoBpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAa,YAAY;IAKvB,YAAoB,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QAJxC,UAAK,GAA+B,EAAE,CAAC;IAII,CAAC;IAEpD,cAAc,CAAC,MAAc;;QAC3B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QACxB,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAE7C,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,IAAI,OAAO,GAAwB,EAAE,CAAC;QACtC,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,IAAI,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAClC,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;YACf,MAAM,GAAG,MAAA,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,0CAAE,MAAM,CAAC;YACxD,OAAO,GAAG,MAAA,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,mCAAI,EAAE,CAAC;SACxD;aAAM,IAAI,mBAAmB,CAAC,IAAI,CAAC,EAAE;YACpC,EAAE,GAAG,IAAI,CAAC;YACV,MAAM,GAAG,MAAA,mBAAmB,CAAC,IAAI,CAAC,CAAC,OAAO,0CAAE,MAAM,CAAC;YACnD,OAAO,GAAG,MAAA,mBAAmB,CAAC,IAAI,CAAC,CAAC,OAAO,mCAAI,EAAE,CAAC;SACnD;QAED,OAAO;YACL,EAAE;YACF,MAAM;YACN,OAAO;YACP,WAAW,EAAE,MAAA,mBAAmB,CAAC,EAAE,CAAC,CAAC,OAAO,0CAAE,WAAW;SAC1D,CAAC;IACJ,CAAC;IAED,UAAU,CAAC,WAAwB;;QACjC,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;QAE5C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;YACnB,MAAM,IAAI,GAAG,IAAI,gCAAU,CAAC;gBAC1B,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,YAAE,CAAC,IAAI,EAAE,CAAC,MAAM;gBAClD,MAAM;gBACN,aAAa,EAAE;oBACb,MAAM,EAAE,IAAI;oBACZ,MAAM,EAAE,IAAI;iBACb;aACF,CAAC,CAAC;YAEH,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;SACvB;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED,aAAa,CAAC,MAAc,EAAE,MAAc
|
|
1
|
+
{"version":3,"file":"WorkerRunner.js","sourceRoot":"","sources":["../../src/runners/WorkerRunner.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lage-run/scheduler",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.4",
|
|
4
4
|
"description": "Scheduler for Lage",
|
|
5
5
|
"repository": {
|
|
6
6
|
"url": "https://github.com/microsoft/lage"
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"@lage-run/target-graph": "^0.3.2",
|
|
19
19
|
"@lage-run/logger": "^1.2.0",
|
|
20
20
|
"@lage-run/cache": "^0.1.10",
|
|
21
|
-
"@lage-run/worker-threads-pool": "^0.1.
|
|
21
|
+
"@lage-run/worker-threads-pool": "^0.1.2",
|
|
22
22
|
"p-graph": "^1.1.1",
|
|
23
23
|
"p-profiler": "^0.2.1",
|
|
24
24
|
"abort-controller": "^3.0.0",
|