Skip to content

Commit

Permalink
Fix bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilquist committed Jul 17, 2024
1 parent df4334f commit cd0c148
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions modules/core/shared/src/main/scala/net/BitVectorSocket.scala
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,11 @@ object BitVectorSocket {
sockets: Resource[F, Socket[F]],
sslOptions: Option[SSLNegotiation.Options[F]],
readTimeout: Duration
)(implicit ev: Temporal[F]): Resource[F, BitVectorSocket[F]] = {

def fail[A](msg: String): Resource[F, A] =
Resource.eval(ev.raiseError(new SkunkException(message = msg, sql = None)))

def sock: Resource[F, Socket[F]] = {
(Host.fromString(host), Port.fromInt(port)) match {
case (Some(validHost), Some(validPort)) => sg.client(SocketAddress(validHost, validPort), socketOptions)
case (None, _) => fail(s"""Hostname: "$host" is not syntactically valid.""")
case (_, None) => fail(s"Port: $port falls out of the allowed range.")
}
}

): Resource[F, BitVectorSocket[F]] =
for {
sock <- sockets
sockʹ <- sslOptions.fold(sock.pure[Resource[F, *]])(SSLNegotiation.negotiateSSL(sock, _))
carry <- Resource.eval(Ref.of(Chunk.empty[Byte]))
} yield fromSocket(sockʹ, readTimeout, carry)

}

0 comments on commit cd0c148

Please sign in to comment.