Merge pull request #13072 from Budibase/fix-default-isolatedvm-values
Fix defaulting values
This commit is contained in:
commit
9331a000ee
|
@ -38,10 +38,9 @@ export class IsolatedVM implements VM {
|
||||||
invocationTimeout?: number
|
invocationTimeout?: number
|
||||||
isolateAccumulatedTimeout?: number
|
isolateAccumulatedTimeout?: number
|
||||||
} = {}) {
|
} = {}) {
|
||||||
memoryLimit = memoryLimit || environment.JS_RUNNER_MEMORY_LIMIT
|
this.isolate = new ivm.Isolate({
|
||||||
invocationTimeout = memoryLimit || 1000
|
memoryLimit: memoryLimit || environment.JS_RUNNER_MEMORY_LIMIT,
|
||||||
|
})
|
||||||
this.isolate = new ivm.Isolate({ memoryLimit })
|
|
||||||
this.vm = this.isolate.createContextSync()
|
this.vm = this.isolate.createContextSync()
|
||||||
this.jail = this.vm.global
|
this.jail = this.vm.global
|
||||||
this.jail.setSync("global", this.jail.derefInto())
|
this.jail.setSync("global", this.jail.derefInto())
|
||||||
|
@ -51,7 +50,8 @@ export class IsolatedVM implements VM {
|
||||||
[this.resultKey]: { [this.runResultKey]: "" },
|
[this.resultKey]: { [this.runResultKey]: "" },
|
||||||
})
|
})
|
||||||
|
|
||||||
this.invocationTimeout = invocationTimeout
|
this.invocationTimeout =
|
||||||
|
invocationTimeout || environment.JS_PER_INVOCATION_TIMEOUT_MS
|
||||||
this.isolateAccumulatedTimeout = isolateAccumulatedTimeout
|
this.isolateAccumulatedTimeout = isolateAccumulatedTimeout
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue