phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2026-04-03 09:50:10 +02:00
Code Issues Activity

🐛 Tweak handling of RealShell

Browse Source 
This commit avoids the usage of `readDataToEndOfFile` and instead uses
a helper method that:

- Attempts to use `.readToEnd()`
- Has a fallback to return an empty string
- Attempts to close the pipe
This commit is contained in:
Nico Verbruggen
2025-11-27 18:47:39 +01:00
parent 89a83bcb4e
commit 464fa78deb
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,23 @@ class RealShell: ShellProtocol {
return task return task
} }
/**
Reads the entire output of a `Pipe` and returns it as a UTF‑8 string.
Closes the pipe's file handler when done.
*/
private static func getStringOutput(from pipe: Pipe) -> String {
// 1. Read all data (safely).
let rawData = (try? pipe.fileHandleForReading.readToEnd()) ?? Data()
// 2. Convert to string (safely).
let result = String(data: rawData, encoding: .utf8) ?? ""
// 3. Close the handle quietly.
try? pipe.fileHandleForReading.close()
return result
}
// MARK: - Public API // MARK: - Public API
/** /**
@@ -114,11 +131,8 @@ class RealShell: ShellProtocol {
return .out("", "") return .out("", "")
} }
let stdOut = String(data: outputPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? "" let stdOut = RealShell.getStringOutput(from: outputPipe)
let stdErr = String(data: errorPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? "" let stdErr = RealShell.getStringOutput(from: errorPipe)
try? outputPipe.fileHandleForReading.close()
try? errorPipe.fileHandleForReading.close()
if Log.shared.verbosity == .cli { if Log.shared.verbosity == .cli {
log(process: process, stdOut: stdOut, stdErr: stdErr) log(process: process, stdOut: stdOut, stdErr: stdErr)
@@ -145,14 +159,11 @@ class RealShell: ShellProtocol {
process.terminationHandler = { [weak self] _ in process.terminationHandler = { [weak self] _ in
if process.terminationReason == .uncaughtSignal { if process.terminationReason == .uncaughtSignal {
Log.err("The command `\(command)` likely crashed. Returning empty output.") Log.err("The command `\(command)` likely crashed. Returning empty output.")
continuation.resume(returning: .out("", "")) return continuation.resume(returning: .out("", ""))
} }
let stdOut = String(data: outputPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? "" let stdOut = RealShell.getStringOutput(from: outputPipe)
let stdErr = String(data: errorPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? "" let stdErr = RealShell.getStringOutput(from: errorPipe)
try? outputPipe.fileHandleForReading.close()
try? errorPipe.fileHandleForReading.close()
if Log.shared.verbosity == .cli { if Log.shared.verbosity == .cli {
self?.log(process: process, stdOut: stdOut, stdErr: stdErr) self?.log(process: process, stdOut: stdOut, stdErr: stdErr)