Prefer CancellationError to uncaught SIGTERM (#8)

GeorgeLyon · Dec 28, 2021 · e23c1e6 · e23c1e6
1 parent 8076673
commit e23c1e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 22 deletions.
diff --git a/Sources/Shwift/Context.swift b/Sources/Shwift/Context.swift
@@ -58,7 +58,7 @@ private final class NullDeviceHandler: ChannelInboundHandler {
 private final class FatalDeviceHandler: ChannelInboundHandler {
   typealias InboundIn = ByteBuffer
   func channelRead(context: ChannelHandlerContext, data: NIOAny) {
-    fatalError()
+    fatalError(String(buffer: unwrapInboundIn(data)))
   }
 }
 

diff --git a/Sources/Shwift/Process.swift b/Sources/Shwift/Process.swift
@@ -190,6 +190,11 @@ public struct Process {
       break
     }
 
+    /**
+     If the task has been cancelled, we want cancellation to supercede the temination status of the executable (often a SIGTERM).
+     */
+    try Task.checkCancellation()
+
     switch Int(info.si_code) {
     case Int(CLD_EXITED):
       let terminationStatus = info[keyPath: sigchldInfo].si_status

diff --git a/Support/VSCode/.gitignore b/Support/VSCode/.gitignore
@@ -0,0 +1 @@
+launch.json
diff --git a/Support/VSCode/launch.json b/Support/VSCode/launch.json