fix(startup): return when any server exits
This commit is contained in:
parent
506b201cf4
commit
3d26b67003
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "TrapOS",
|
||||
"version": "0.5.0",
|
||||
"version": "0.5.1",
|
||||
"branch": "next",
|
||||
"packages": [
|
||||
"trapos"
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
"packages": {
|
||||
"tos-core": "0.3.0",
|
||||
"tos-test": "0.2.0",
|
||||
"tos-boot": "0.2.0",
|
||||
"tos-boot": "0.2.1",
|
||||
"tos-net": "0.2.0",
|
||||
"tos-ui": "0.2.0",
|
||||
"tos-ai": "0.2.0",
|
||||
"trapos": "0.5.0"
|
||||
"trapos": "0.5.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tos-boot",
|
||||
"version": "0.2.0",
|
||||
"version": "0.2.1",
|
||||
"description": "TrapOS boot: startup MOTD and autostart server launcher",
|
||||
"dependencies": ["tos-core"],
|
||||
"files": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "trapos",
|
||||
"version": "0.5.0",
|
||||
"version": "0.5.1",
|
||||
"description": "TrapOS full install meta-package",
|
||||
"dependencies": ["tos-boot", "tos-net", "tos-ui", "tos-test"],
|
||||
"files": [],
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
local _VERSION = '1.3.2'
|
||||
local _VERSION = '1.3.3'
|
||||
|
||||
local LOCAL_MANIFEST_PATH = '/trapos/manifest.json';
|
||||
|
||||
@ -55,6 +55,6 @@ if #SERVERS > 0 then
|
||||
end
|
||||
end
|
||||
|
||||
parallel.waitForAll(shellFn, table.unpack(servers));
|
||||
parallel.waitForAny(shellFn, table.unpack(servers));
|
||||
|
||||
os.shutdown();
|
||||
|
||||
@ -26,7 +26,7 @@ local function runStartupWithStubs()
|
||||
sleep = function() end,
|
||||
},
|
||||
parallel = {
|
||||
waitForAll = function(firstFn)
|
||||
waitForAny = function(firstFn)
|
||||
firstFn();
|
||||
end,
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user