michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-02-17 04:02:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: apply default runtime for cluster fork

Browse Source
This commit is contained in:
Koushik Dutta
2024-11-18 21:03:00 -08:00
parent 924394d365
commit ca243e79bb
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/server",
"version": "0.123.30",
"version": "0.123.31",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@scrypted/server",
"version": "0.123.30",
"version": "0.123.31",
"hasInstallScript": true,
"license": "ISC",
"dependencies": {

4
server/python/plugin_remote.py
View File

@@ -777,7 +777,9 @@ class PluginRemote:
peerLiveness = PeerLiveness(self.loop)
async def startClusterFork():
forkComponent = await self.api.getComponent("cluster-fork")
clusterForkResult = await forkComponent.fork(peerLiveness, options, packageJson, zipHash, lambda: zipAPI.getZip())
sanitizedOptions = options.copy()
sanitizedOptions["runtime"] = sanitizedOptions.get("runtime", "python")
clusterForkResult = await forkComponent.fork(peerLiveness, sanitizedOptions, packageJson, zipHash, lambda: zipAPI.getZip())
async def waitPeerLiveness():
try:

5
server/src/plugin/runtime/cluster-fork-worker.ts
View File

@@ -37,7 +37,10 @@ export function createClusterForkWorker(
});
const peerLiveness = new PeerLiveness(waitKilled.promise);
const clusterForkResultPromise = forkComponentPromise.then(forkComponent => forkComponent.fork(peerLiveness, options, packageJson, zipHash, getZip));
const clusterForkResultPromise = forkComponentPromise.then(forkComponent => forkComponent.fork(peerLiveness, {
runtime: options.runtime || 'node',
...options,
}, packageJson, zipHash, getZip));
clusterForkResultPromise.catch(() => {});
const clusterWorkerId = clusterForkResultPromise.then(clusterForkResult => clusterForkResult.clusterWorkerId);