ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-18 02:39:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-09-04

Browse Source
This commit is contained in:
r3-build 2023-09-04 10:21:44 +00:00
commit 33798df51d
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.ci/dev/forward-merge/Jenkinsfile vendored Normal file
View File

@ -0,0 +1,8 @@
@Library('corda-shared-build-pipeline-steps@5.1') _
forwardMerger(
targetBranch: 'release/os/4.11',
originBranch: 'release/os/4.10',
slackChannel: '#build-team-automated-notifications'
)

28
node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyAcceptorFactory.kt
View File

@ -9,6 +9,7 @@ import io.netty.handler.ssl.SslHandler
import io.netty.handler.ssl.SslHandshakeTimeoutException import io.netty.handler.ssl.SslHandshakeTimeoutException
import net.corda.core.internal.declaredField import net.corda.core.internal.declaredField
import net.corda.core.utilities.contextLogger import net.corda.core.utilities.contextLogger
import net.corda.core.utilities.trace
import net.corda.nodeapi.internal.ArtemisTcpTransport import net.corda.nodeapi.internal.ArtemisTcpTransport
import net.corda.nodeapi.internal.protonwrapper.netty.sslDelegatedTaskExecutor import net.corda.nodeapi.internal.protonwrapper.netty.sslDelegatedTaskExecutor
import net.corda.nodeapi.internal.setThreadPoolName import net.corda.nodeapi.internal.setThreadPoolName
@ -131,6 +132,7 @@ class NodeNettyAcceptorFactory : AcceptorFactory {
delegatedTaskExecutor: Executor, delegatedTaskExecutor: Executor,
private val trace: Boolean) : SslHandler(engine, delegatedTaskExecutor) { private val trace: Boolean) : SslHandler(engine, delegatedTaskExecutor) {
companion object { companion object {
private val nettyLogHandshake = System.getProperty("net.corda.node.services.messaging.nettyLogHandshake")?.toBoolean() ?: false
private val logger = contextLogger() private val logger = contextLogger()
} }
@ -153,15 +155,31 @@ class NodeNettyAcceptorFactory : AcceptorFactory {
remoteAddress remoteAddress
} }
when { when {
it.isSuccess -> logger.info("SSL handshake completed in ${duration}ms with $peer") it.isSuccess -> loggerInfo { "SSL handshake completed in ${duration}ms with $peer" }
it.isCancelled -> logger.warn("SSL handshake cancelled after ${duration}ms with $peer") it.isCancelled -> loggerWarn { "SSL handshake cancelled after ${duration}ms with $peer" }
else -> when (it.cause()) { else -> when (it.cause()) {
is ClosedChannelException -> logger.warn("SSL handshake closed early after ${duration}ms with $peer") is ClosedChannelException -> loggerWarn { "SSL handshake closed early after ${duration}ms with $peer" }
is SslHandshakeTimeoutException -> logger.warn("SSL handshake timed out after ${duration}ms with $peer") is SslHandshakeTimeoutException -> loggerWarn { "SSL handshake timed out after ${duration}ms with $peer" }
else -> logger.warn("SSL handshake failed after ${duration}ms with $peer", it.cause()) else -> loggerWarn(it.cause()) {"SSL handshake failed after ${duration}ms with $peer" }
} }
} }
} }
} }
private fun loggerInfo(msgFn: () -> String) {
if (nettyLogHandshake && logger.isInfoEnabled) {
logger.info(msgFn())
}
else {
logger.trace { msgFn() }
}
}
private fun loggerWarn(t: Throwable? = null, msgFn: () -> String) {
if (nettyLogHandshake && logger.isWarnEnabled) {
logger.warn(msgFn(), t)
}
else if (logger.isTraceEnabled) {
logger.trace(msgFn(), t)
}
}
} }
} }