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

Jump to bottom

Added automaticTopologyRecovery to Fs2RabbitConfig #972

Merged
merged 3 commits into from
Sep 4, 2024
Merged

Added automaticTopologyRecovery to Fs2RabbitConfig #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a5c9d8
Added automaticTopologyRecovery to Fs2RabbitConfig
SheliakLyr Sep 3, 2024
8ea83f7
Merge branch 'master' into autoTopologyRecovery
geirolz Sep 3, 2024
c611b6a
Merge branch 'master' into autoTopologyRecovery
geirolz Sep 3, 2024
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
1 change: 1 addition & 0 deletions core/src/main/scala/dev/profunktor/fs2rabbit/algebra/Connection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ object ConnectionResource {
factory.setConnectionTimeout(conf.connectionTimeout.toMillis.toInt)
factory.setRequestedHeartbeat(conf.requestedHeartbeat.toSeconds.toInt)
factory.setAutomaticRecoveryEnabled(conf.automaticRecovery)
factory.setTopologyRecoveryEnabled(conf.automaticTopologyRecovery)
if (conf.ssl) sslCtx.fold(factory.useSslProtocol())(factory.useSslProtocol)
factory.setSaslConfig(saslConf)
conf.username.foreach(factory.setUsername)
Expand Down
5 changes: 4 additions & 1 deletion core/src/main/scala/dev/profunktor/fs2rabbit/config/Fs2RabbitConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ case class Fs2RabbitConfig(
internalQueueSize: Option[Int],
requestedHeartbeat: FiniteDuration,
automaticRecovery: Boolean,
automaticTopologyRecovery: Boolean,
clientProvidedConnectionName: Option[String]
)

Expand All @@ -57,6 +58,7 @@ object Fs2RabbitConfig {
internalQueueSize: Option[Int],
requestedHeartbeat: FiniteDuration = FiniteDuration(ConnectionFactory.DEFAULT_HEARTBEAT, TimeUnit.SECONDS),
automaticRecovery: Boolean = true,
automaticTopologyRecovery: Boolean = true,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the default value for the java library, I suppose, is it not?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, in "modern" versions of that library.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, I mean - the one we are using in fs2-rabbit at least

clientProvidedConnectionName: Option[String] = None
): Fs2RabbitConfig = Fs2RabbitConfig(
nodes = NonEmptyList.one(Fs2RabbitNodeConfig(host, port)),
Expand All @@ -70,6 +72,7 @@ object Fs2RabbitConfig {
internalQueueSize = internalQueueSize,
requestedHeartbeat = requestedHeartbeat,
automaticRecovery = automaticRecovery,
clientProvidedConnectionName = clientProvidedConnectionName
clientProvidedConnectionName = clientProvidedConnectionName,
automaticTopologyRecovery = automaticTopologyRecovery
)
}
1 change: 1 addition & 0 deletions examples/src/main/scala/dev/profunktor/fs2rabbit/examples/DropwizardMetricsDemo.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ object DropwizardMetricsDemo extends IOApp.Simple {
internalQueueSize = Some(500),
requestedHeartbeat = 60.seconds,
automaticRecovery = true,
automaticTopologyRecovery = true,
clientProvidedConnectionName = Some("app:drop-wizard-metrics-demo")
)

Expand Down
1 change: 1 addition & 0 deletions examples/src/main/scala/dev/profunktor/fs2rabbit/examples/IOAckerConsumer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ object IOAckerConsumer extends IOApp.Simple {
internalQueueSize = Some(500),
requestedHeartbeat = 60.seconds,
automaticRecovery = true,
automaticTopologyRecovery = true,
clientProvidedConnectionName = Some("app:io-acker-consumer")
)

Expand Down
1 change: 1 addition & 0 deletions examples/src/main/scala/dev/profunktor/fs2rabbit/examples/RPCDemo.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ object RPCDemo extends IOApp.Simple {
internalQueueSize = Some(500),
requestedHeartbeat = 60.seconds,
automaticRecovery = true,
automaticTopologyRecovery = true,
clientProvidedConnectionName = Some("app:rpc-demo")
)

Expand Down
2 changes: 1 addition & 1 deletion tests/src/test/scala/dev/profunktor/fs2rabbit/interpreter/Fs2RabbitSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ trait Fs2RabbitSpec { self: BaseSpec =>
createConnectionChannel.use { implicit channel =>
randomQueueData
.flatMap { case (q, x, _) =>
declareQueue(DeclarationQueueConfig(q, Durable, Exclusive, AutoDelete, Map.empty)) *>
declareQueue(DeclarationQueueConfig(q, Durable, Exclusive, AutoDelete, Map.empty, None)) *>
declareExchange(x, ExchangeType.Topic)
}
.as(emptyAssertion)
Expand Down
Loading