ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-26 04:15:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(macos): reject unsuccessful service process exits (#129615)

Browse Source
This commit is contained in:
Peter Steinberger
2026-08-25 19:39:22 -07:00
committed by GitHub
parent 0f5cb35a04
commit e4a9407693
3 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/macos/Sources/OpenClaw/GatewayLaunchAgentManager.swift
+1 -1
View File
@@ -362,7 +362,7 @@ extension GatewayLaunchAgentManager {
let message = (parsed?.object["error"] as? String) ?? (parsed?.object["message"] as? String)
let payload = parsed?.text.data(using: .utf8)
?? (response.stdout.isEmpty ? response.stderr : response.stdout).data(using: .utf8)
let success = ok ?? response.success
let success = response.success && (ok ?? true)
if success {
return CommandResult(success: true, payload: payload, message: nil)
}
apps/macos/Sources/OpenClaw/NodeServiceManager.swift
+1 -1
View File
@@ -129,7 +129,7 @@ extension NodeServiceManager {
let message = parsed?.error ?? parsed?.message
let payload = parsed?.text.data(using: .utf8)
?? (response.stdout.isEmpty ? response.stderr : response.stdout).data(using: .utf8)
let success = ok ?? response.success
let success = response.success && (ok ?? true)
if success {
return CommandResult(success: true, payload: payload, message: nil, parsed: parsed)
}
apps/macos/Tests/OpenClawIPCTests/NodeServiceManagerTests.swift
+40
View File
@@ -97,6 +97,46 @@ import Testing
}
}
@Test(arguments: [
"failed-start", "failed-stop", "failed-restart", "json-success", "plain-success", "json-failure",
])
func `node lifecycle respects process exit and optional JSON status`(_ scenario: String) async throws {
let root = try makeTempDirForTests()
defer { try? FileManager.default.removeItem(at: root) }
try await TestIsolation.withIsolatedState(
env: ["OPENCLAW_NODE_SERVICE_TEST_CASE": scenario],
defaults: ["openclaw.gatewayProjectRootPath": nil])
{
CommandResolver.setProjectRoot(root.path)
let executable = root.appendingPathComponent("node_modules/.bin/openclaw")
try makeExecutableForTests(at: executable)
let script = """
#!/bin/sh
case "$OPENCLAW_NODE_SERVICE_TEST_CASE" in
failed-*) printf '{"ok":true}'; printf 'cleanup failed' >&2; exit 23 ;;
json-failure) printf '{"ok":false,"error":"reported failure"}' ;;
plain-success) printf 'service started' ;;
*) printf '{"ok":true}' ;;
esac
"""
try script.write(to: executable, atomically: false, encoding: .utf8)
let action = switch scenario {
case "failed-stop": "stop"
case "failed-restart": "restart"
default: "start"
}
let expectedError: String? = switch scenario {
case "failed-start", "failed-stop", "failed-restart": "cleanup failed"
case "json-failure": "reported failure"
default: nil
}
#expect(await self.runNodeServiceAction(action, profile: AppProfile(environment: [:])) == expectedError)
}
}
@Test func `reads node service ownership command directly from launchd`() throws {
let url = FileManager.default.temporaryDirectory
.appendingPathComponent("openclaw-node-\(UUID().uuidString).plist")