ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-13 04:38:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

renamed external artemis config properties for consistency (#1555)

Browse Source
This commit is contained in:
bpaunescu
2018-11-09 16:47:12 +00:00
committed by GitHub
parent 32ff24ddc7
commit 7fbe8e7de7
9 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
View File

@ -6,7 +6,7 @@ import net.corda.core.utilities.loggerFor
import net.corda.nodeapi.internal.ArtemisMessagingComponent.Companion.NODE_P2P_USER
import net.corda.nodeapi.internal.ArtemisTcpTransport.Companion.p2pConnectorTcpTransport
import net.corda.nodeapi.internal.ArtemisTcpTransport.Companion.p2pConnectorTcpTransportFromList
import net.corda.nodeapi.internal.config.ExternalBrokerConnectionConfiguration
import net.corda.nodeapi.internal.config.MessagingServerConnectionConfiguration
import net.corda.nodeapi.internal.config.MutualSslConfiguration
import org.apache.activemq.artemis.api.core.client.*
import org.apache.activemq.artemis.api.core.client.ActiveMQClient.DEFAULT_ACK_BATCH_SIZE
@ -23,7 +23,7 @@ class ArtemisMessagingClient(private val config: MutualSslConfiguration,
private val autoCommitSends: Boolean = true,
private val autoCommitAcks: Boolean = true,
private val confirmationWindowSize: Int = -1,
private val externalBrokerConnectionConfig: ExternalBrokerConnectionConfiguration? = null,
private val messagingServerConnectionConfig: MessagingServerConnectionConfiguration? = null,
private val backupServerAddressPool: List<NetworkHostAndPort> = emptyList()
) : ArtemisSessionProvider {
companion object {
@ -55,14 +55,14 @@ class ArtemisMessagingClient(private val config: MutualSslConfiguration,
minLargeMessageSize = maxMessageSize
isUseGlobalPools = nodeSerializationEnv != null
confirmationWindowSize = this@ArtemisMessagingClient.confirmationWindowSize
externalBrokerConnectionConfig?.let {
messagingServerConnectionConfig?.let {
connectionLoadBalancingPolicyClassName = RoundRobinConnectionPolicy::class.java.canonicalName
reconnectAttempts = externalBrokerConnectionConfig.reconnectAttempts
retryInterval = externalBrokerConnectionConfig.retryInterval.toMillis()
retryIntervalMultiplier = externalBrokerConnectionConfig.retryIntervalMultiplier
maxRetryInterval = externalBrokerConnectionConfig.maxRetryInterval.toMillis()
isFailoverOnInitialConnection = externalBrokerConnectionConfig.failoverOnInitialAttempt
initialConnectAttempts = externalBrokerConnectionConfig.initialConnectAttempts
reconnectAttempts = messagingServerConnectionConfig.reconnectAttempts
retryInterval = messagingServerConnectionConfig.retryInterval.toMillis()
retryIntervalMultiplier = messagingServerConnectionConfig.retryIntervalMultiplier
maxRetryInterval = messagingServerConnectionConfig.maxRetryInterval.toMillis()
isFailoverOnInitialConnection = messagingServerConnectionConfig.failoverOnInitialAttempt
initialConnectAttempts = messagingServerConnectionConfig.initialConnectAttempts
}
addIncomingInterceptor(ArtemisMessageSizeChecksInterceptor(maxMessageSize))
}

2
node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ExternalBrokerConnectionConfiguration.kt → node-api/src/main/kotlin/net/corda/nodeapi/internal/config/MessagingServerConnectionConfiguration.kt
View File

@ -24,7 +24,7 @@ import java.time.Duration
* @param retryIntervalMultiplier Value used in the reconnection back-off process.
* @param maxRetryInterval Determines the maximum duration between reconnection attempts. Useful when using infinite retries.
*/
enum class ExternalBrokerConnectionConfiguration(
enum class MessagingServerConnectionConfiguration(
val failoverOnInitialAttempt: Boolean,
val initialConnectAttempts: Int,
val reconnectAttempts: Int,