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

CORDA-2886 - Better handling of authentication error when re-connecting to RPC in RpcReconnectTest (#5052)

Browse Source
This commit is contained in:
Tudor Malene 2019-04-25 13:40:25 +01:00 committed by Shams Asari
parent 851ceac3d1
commit 555abc193e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
View File

@ -179,7 +179,8 @@ class ReconnectingCordaRPCOps private constructor(
return currentRPCConnection!!
}
private tailrec fun establishConnectionWithRetry(retryInterval: Duration = 1.seconds, nrRetries: Int = 0): CordaRPCConnection {
private tailrec fun establishConnectionWithRetry(retryInterval: Duration = 1.seconds, currentAuthenticationRetries: Int = 0): CordaRPCConnection {
var _currentAuthenticationRetries = currentAuthenticationRetries
log.info("Connecting to: $nodeHostAndPorts")
try {
return CordaRPCClient(
@ -196,7 +197,7 @@ class ReconnectingCordaRPCOps private constructor(
is ActiveMQSecurityException -> {
// Happens when incorrect credentials provided.
// It can happen at startup as well when the credentials are correct.
if (nrRetries > 1) {
if (_currentAuthenticationRetries++ > 1) {
log.error("Failed to login to node.", ex)
throw ex
}
@ -222,7 +223,7 @@ class ReconnectingCordaRPCOps private constructor(
// Could not connect this time round - pause before giving another try.
Thread.sleep(retryInterval.toMillis())
// TODO - make the exponential retry factor configurable.
return establishConnectionWithRetry((retryInterval * 10) / 9, nrRetries + 1)
return establishConnectionWithRetry((retryInterval * 10) / 9, _currentAuthenticationRetries)
}
override val proxy: CordaRPCOps