phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 03:50:08 +02:00
Code Releases Activity

👌 Touching up correctness of process handling

Browse Source
This commit is contained in:
Nico Verbruggen
2022-10-19 14:57:28 +02:00
parent 696f9bf351
commit 8310cf2729
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
phpmon/Common/Shell/RealShell.swift
View File

@ -125,11 +125,11 @@ class RealShell: ShellProtocol {
didReceiveOutput: @escaping (String, ShellStream) -> Void,
withTimeout timeout: TimeInterval = 5.0
) async throws -> (Process, ShellOutput) {
let task = getShellProcess(for: command)
let process = getShellProcess(for: command)
let output = ShellOutput.empty()
task.listen { incoming in
process.listen { incoming in
output.out += incoming; didReceiveOutput(incoming, .stdOut)
} didReceiveStandardErrorData: { incoming in
output.err += incoming; didReceiveOutput(incoming, .stdErr)
@ -137,16 +137,19 @@ class RealShell: ShellProtocol {
return try await withCheckedThrowingContinuation({ continuation in
let timer = Timer.scheduledTimer(withTimeInterval: timeout, repeats: false) { _ in
task.terminationHandler = nil
task.terminate()
return continuation.resume(throwing: ShellError.timedOut)
// Only terminate if the process is still running
if process.isRunning {
process.terminationHandler = nil
process.terminate()
return continuation.resume(throwing: ShellError.timedOut)
}
}
task.terminationHandler = { [timer, output] process in
process.haltListening()
process.terminationHandler = { [timer, output] process in
timer.invalidate()
process.haltListening()
if !output.err.isEmpty {
return continuation.resume(returning: (process, .err(output.err)))
}
@ -154,8 +157,8 @@ class RealShell: ShellProtocol {
return continuation.resume(returning: (process, .out(output.out)))
}
task.launch()
task.waitUntilExit()
process.launch()
process.waitUntilExit()
})
}
}