Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions Sources/Subprocess/Error.swift
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ extension SubprocessError {
private enum Context: Sendable, Hashable {
case string(String)
case int(Int)
case processControlOperation(ProcessControlOperation)
case processControlOperation(ProcessControlOperation, reason: String?)
}

internal enum ProcessControlOperation: Sendable, Hashable {
Expand Down Expand Up @@ -199,22 +199,26 @@ extension SubprocessError: CustomStringConvertible, CustomDebugStringConvertible
}

case .processControlFailed:
if let context = self.context[self.code],
case .processControlOperation(let operation) = context
{
switch operation {
case .sendSignal(let signal):
return "Failed to send signal \(signal) to child process"
case .terminate:
return "Failed to terminate child process."
case .suspend:
return "Failed to suspend child process."
case .resume:
return "Failed to resume child process."
}
} else {
guard let context = self.context[self.code],
case .processControlOperation(let operation, let reason) = context
else {
return "Failed to control child process state"
}
var message: [String]
switch operation {
case .sendSignal(let signal):
message = ["Failed to send signal \(signal) to child process."]
case .terminate:
message = ["Failed to terminate child process."]
case .suspend:
message = ["Failed to suspend child process."]
case .resume:
message = ["Failed to resume child process."]
}
if let reason {
message.append("Reason: \(reason)")
}
return message.joined(separator: " ")
}
}

Expand Down Expand Up @@ -290,11 +294,15 @@ extension SubprocessError {
)
}

internal static func processControlFailed(_ operation: ProcessControlOperation, underlyingError: UnderlyingError?) -> Self {
internal static func processControlFailed(
_ operation: ProcessControlOperation,
reason: String? = nil,
underlyingError: UnderlyingError?
) -> Self {
return SubprocessError(
code: .processControlFailed,
underlyingError: underlyingError,
context: [.processControlFailed: .processControlOperation(operation)]
context: [.processControlFailed: .processControlOperation(operation, reason: reason)]
)
}

Expand Down
Loading
Loading