guillaumearm/cc-libs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(startup): return when any server exits

Browse Source
This commit is contained in:
Guillaume ARM 2026-06-09 03:48:08 +02:00
parent 506b201cf4
commit 3d26b67003
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name": "TrapOS", "name": "TrapOS",
"version": "0.5.0", "version": "0.5.1",
"branch": "next", "branch": "next",
"packages": [ "packages": [
"trapos" "trapos"

4
packages/index.json
View File

@ -2,10 +2,10 @@
"packages": { "packages": {
"tos-core": "0.3.0", "tos-core": "0.3.0",
"tos-test": "0.2.0", "tos-test": "0.2.0",
"tos-boot": "0.2.0", "tos-boot": "0.2.1",
"tos-net": "0.2.0", "tos-net": "0.2.0",
"tos-ui": "0.2.0", "tos-ui": "0.2.0",
"tos-ai": "0.2.0", "tos-ai": "0.2.0",
"trapos": "0.5.0" "trapos": "0.5.1"
} }
} }

2
packages/tos-boot/ccpm.json
View File

@ -1,6 +1,6 @@
{ {
"name": "tos-boot", "name": "tos-boot",
"version": "0.2.0", "version": "0.2.1",
"description": "TrapOS boot: startup MOTD and autostart server launcher", "description": "TrapOS boot: startup MOTD and autostart server launcher",
"dependencies": ["tos-core"], "dependencies": ["tos-core"],
"files": [ "files": [

2
packages/trapos/ccpm.json
View File

@ -1,6 +1,6 @@
{ {
"name": "trapos", "name": "trapos",
"version": "0.5.0", "version": "0.5.1",
"description": "TrapOS full install meta-package", "description": "TrapOS full install meta-package",
"dependencies": ["tos-boot", "tos-net", "tos-ui", "tos-test"], "dependencies": ["tos-boot", "tos-net", "tos-ui", "tos-test"],
"files": [], "files": [],

4
startup/servers.lua
View File

@ -1,4 +1,4 @@
local _VERSION = '1.3.2' local _VERSION = '1.3.3'
local LOCAL_MANIFEST_PATH = '/trapos/manifest.json'; local LOCAL_MANIFEST_PATH = '/trapos/manifest.json';
@ -55,6 +55,6 @@ if #SERVERS > 0 then
end end
end end
parallel.waitForAll(shellFn, table.unpack(servers)); parallel.waitForAny(shellFn, table.unpack(servers));
os.shutdown(); os.shutdown();

2
tests/startup-servers.lua
View File

@ -26,7 +26,7 @@ local function runStartupWithStubs()
sleep = function() end, sleep = function() end,
}, },
parallel = { parallel = {
waitForAll = function(firstFn) waitForAny = function(firstFn)
firstFn(); firstFn();
end, end,
}, },