dorkbox
/
Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

logging

This commit is contained in:
Robinson 2023-10-19 23:41:27 +02:00
parent a15478c535
commit 0e16747dc2
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dorkbox/network/aeron/AeronDriverInternal.kt
View File

@ -785,9 +785,7 @@ internal class AeronDriverInternal(endPoint: EndPoint<*>?, config: Configuration
if (logger.isTraceEnabled) {
val elements = registeredPublicationsTrace.elements
val joined = elements.joinToString()
if (logger.isDebugEnabled) {
logger.debug("Aeron Driver [$driverId]: has [$joined] publications (${registeredPublications.value} total)")
}
logger.trace("Aeron Driver [$driverId]: has publications: [$joined] (${registeredPublications.value} total)")
} else if (logger.isDebugEnabled) {
logger.debug("Aeron Driver [$driverId]: has publications (${registeredPublications.value} total)")
}
@ -798,9 +796,7 @@ internal class AeronDriverInternal(endPoint: EndPoint<*>?, config: Configuration
if (logger.isTraceEnabled) {
val elements = registeredSubscriptionsTrace.elements
val joined = elements.joinToString()
if (logger.isDebugEnabled) {
logger.debug("Aeron Driver [$driverId]: has [$joined] subscriptions (${registeredSubscriptions.value} total)")
}
logger.trace("Aeron Driver [$driverId]: has subscriptions: [$joined] (${registeredSubscriptions.value} total)")
} else if (logger.isDebugEnabled) {
logger.debug("Aeron Driver [$driverId]: has subscriptions (${registeredSubscriptions.value} total)")
}

11
src/dorkbox/network/connection/session/Session.kt
View File

@ -90,13 +90,13 @@ open class Session<CONNECTION: SessionConnection>(@Volatile var connection: CONN
fun queueMessage(connection: SessionConnection, message: Any, abortEarly: Boolean): Boolean {
if (this.connection != connection) {
connection.logger.error("[{}] MESSAGE RECEIVED ON OLD CONNECTION, RESENDING", connection)
connection.logger.trace("[{}] message received on old connection, resending", connection)
// we received a message on an OLD connection (which is no longer connected ---- BUT we have a NEW connection that is connected)
// this can happen on RMI object that are old
val success = this.connection.send(message, abortEarly)
if (success) {
connection.logger.error("[{}] successfully resent message", connection)
connection.logger.trace("[{}] successfully resent message", connection)
return true
}
}
@ -104,22 +104,21 @@ open class Session<CONNECTION: SessionConnection>(@Volatile var connection: CONN
if (!abortEarly) {
// this was a "normal" send (instead of the disconnect message).
pendingMessagesQueue.put(message)
connection.logger.error("[{}] queueing message", connection)
connection.logger.trace("[{}] queueing message", connection)
}
else if (connection.endPoint.aeronDriver.internal.mustRestartDriverOnError) {
// the only way we get errors, is if the connection is bad OR if we are sending so fast that the connection cannot keep up.
// don't restart/reconnect -- there was an internal network error
pendingMessagesQueue.put(message)
connection.logger.error("[{}] queueing message", connection)
connection.logger.trace("[{}] queueing message", connection)
}
else if (!connection.isClosedWithTimeout()) {
// there was an issue - the connection should automatically reconnect
pendingMessagesQueue.put(message)
connection.logger.error("[{}] queueing message", connection)
connection.logger.trace("[{}] queueing message", connection)
}
connection.logger.error("[{}] NOT NOT NOT queueing message", connection)
return false
}
}