phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2026-04-02 17:40:08 +02:00
Code Issues Activity

🐛 Fix unwrap stdOut and stdErr (in multiple places)

Browse Source
This commit is contained in:
Nico Verbruggen
2025-11-03 15:41:08 +01:00
parent b1f7c2e1e5
commit 32f28fc6fb
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,8 +104,8 @@ class RealShell: ShellProtocol {
task.launch() task.launch()
task.waitUntilExit() task.waitUntilExit()
let stdOut = String(data: outputPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)! let stdOut = String(data: outputPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? ""
let stdErr = String(data: errorPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)! let stdErr = String(data: errorPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? ""
if Log.shared.verbosity == .cli { if Log.shared.verbosity == .cli {
log(task: task, stdOut: stdOut, stdErr: stdErr) log(task: task, stdOut: stdOut, stdErr: stdErr)
@@ -130,8 +130,8 @@ class RealShell: ShellProtocol {
return await withCheckedContinuation { continuation in return await withCheckedContinuation { continuation in
task.terminationHandler = { [weak self] _ in task.terminationHandler = { [weak self] _ in
let stdOut = String(data: outputPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)! let stdOut = String(data: outputPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? ""
let stdErr = String(data: errorPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)! let stdErr = String(data: errorPipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8) ?? ""
if Log.shared.verbosity == .cli { if Log.shared.verbosity == .cli {
self?.log(task: task, stdOut: stdOut, stdErr: stdErr) self?.log(task: task, stdOut: stdOut, stdErr: stdErr)
@@ -141,7 +141,6 @@ class RealShell: ShellProtocol {
} }
task.launch() task.launch()
task.waitUntilExit()
} }
} }
@@ -215,7 +214,6 @@ class RealShell: ShellProtocol {
} }
process.launch() process.launch()
process.waitUntilExit()
}) })
} }