Fix force try in connect method (#71)

* Fail bit more gracefully * Remove log * Remove linux tests
vapor · Jul 13, 2020 · b073601 · b073601
1 parent 4515d82
commit b073601
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/Sources/WebSocketKit/WebSocketClient.swift b/Sources/WebSocketKit/WebSocketClient.swift
@@ -91,14 +91,18 @@ public final class WebSocketClient {
                 )
 
                 if scheme == "wss" {
-                    let context = try! NIOSSLContext(
-                        configuration: self.configuration.tlsConfiguration ?? .forClient()
-                    )
-                    let tlsHandler = try! NIOSSLClientHandler(context: context, serverHostname: host)
-                    return channel.pipeline.addHandler(tlsHandler).flatMap {
-                        channel.pipeline.addHTTPClientHandlers(leftOverBytesStrategy: .forwardBytes, withClientUpgrade: config)
-                    }.flatMap {
-                        channel.pipeline.addHandler(httpHandler)
+                    do {
+                        let context = try NIOSSLContext(
+                            configuration: self.configuration.tlsConfiguration ?? .forClient()
+                        )
+                        let tlsHandler = try NIOSSLClientHandler(context: context, serverHostname: host)
+                        return channel.pipeline.addHandler(tlsHandler).flatMap {
+                            channel.pipeline.addHTTPClientHandlers(leftOverBytesStrategy: .forwardBytes, withClientUpgrade: config)
+                        }.flatMap {
+                            channel.pipeline.addHandler(httpHandler)
+                        }
+                    } catch {
+                        return channel.pipeline.close(mode: .all)
                     }
                 } else {
                     return channel.pipeline.addHTTPClientHandlers(