Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Netty's SO_TIMEOUT setting #3579

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Remove Netty's SO_TIMEOUT setting #3579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions server/netty-server/src/main/scala/sttp/tapir/server/netty/NettyConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ import scala.concurrent.duration._
* @param connectionTimeout
* Specifies the maximum duration within which a connection between a client and a server must be established.
*
* @param socketTimeout
* Refers to the duration for which a socket operation will wait before throwing an exception if no data is received or sent. Socket
* timeout also effectively establishes a read timeout.
*
* @param lingerTimeout
* Sets the delay for which the Netty waits, while data is being transmitted, before closing a socket after receiving a call to close the
* socket
Expand All @@ -56,7 +52,6 @@ case class NettyConfig(
socketBacklog: Int,
requestTimeout: Option[FiniteDuration],
connectionTimeout: Option[FiniteDuration],
socketTimeout: Option[FiniteDuration],
lingerTimeout: Option[FiniteDuration],
socketKeepAlive: Boolean,
addLoggingHandler: Boolean,
Expand All @@ -80,7 +75,6 @@ case class NettyConfig(

def requestTimeout(r: FiniteDuration): NettyConfig = copy(requestTimeout = Some(r))
def connectionTimeout(c: FiniteDuration): NettyConfig = copy(connectionTimeout = Some(c))
def socketTimeout(s: FiniteDuration): NettyConfig = copy(socketTimeout = Some(s))
def lingerTimeout(l: FiniteDuration): NettyConfig = copy(requestTimeout = Some(l))

def withSocketKeepAlive: NettyConfig = copy(socketKeepAlive = true)
Expand Down Expand Up @@ -113,7 +107,6 @@ object NettyConfig {
socketKeepAlive = true,
requestTimeout = Some(20.seconds),
connectionTimeout = Some(10.seconds),
socketTimeout = Some(60.seconds),
lingerTimeout = Some(60.seconds),
gracefulShutdownTimeout = Some(10.seconds),
maxConnections = None,
Expand Down
1 change: 0 additions & 1 deletion server/netty-server/src/main/scala/sttp/tapir/server/netty/internal/NettyBootstrap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ object NettyBootstrap {
nettyConfig.socketConfig.receiveBuffer.foreach(i => httpBootstrap.childOption[java.lang.Integer](ChannelOption.SO_RCVBUF, i))
nettyConfig.socketConfig.sendBuffer.foreach(i => httpBootstrap.childOption[java.lang.Integer](ChannelOption.SO_SNDBUF, i))
nettyConfig.socketConfig.typeOfService.foreach(i => httpBootstrap.childOption[java.lang.Integer](ChannelOption.IP_TOS, i))
nettyConfig.socketTimeout.foreach(i => httpBootstrap.childOption[java.lang.Integer](ChannelOption.SO_TIMEOUT, i.toSeconds.toInt))
nettyConfig.lingerTimeout.foreach(i => httpBootstrap.childOption[java.lang.Integer](ChannelOption.SO_LINGER, i.toSeconds.toInt))
nettyConfig.connectionTimeout.foreach(i =>
httpBootstrap.childOption[java.lang.Integer](ChannelOption.CONNECT_TIMEOUT_MILLIS, i.toMillis.toInt)
Expand Down
Loading