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

Updated logging

This commit is contained in:
Robinson 2023-10-17 16:48:31 +02:00
parent ee296c602a
commit 4d09999f0a
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dorkbox/network/connection/EndPoint.kt
View File

@ -626,12 +626,19 @@ abstract class EndPoint<CONNECTION : Connection> private constructor(val type: C
// the remote endPoint will send this message if it is closing the connection.
// IF we get this message in time, then we do not have to wait for the connection to expire before closing it
is DisconnectMessage -> {
val closeEverything = message.closeEverything
if (logger.isDebugEnabled) {
logger.debug("Received disconnect message from: $otherTypeName")
if (closeEverything) {
logger.debug("Received disconnect message from $otherTypeName")
} else {
logger.debug("Received session disconnect message from $otherTypeName")
}
}
connection.close(sendDisconnectMessage = false,
notifyDisconnect = true,
closeEverything = message.closeEverything)
closeEverything = closeEverything
)
}
// streaming message. This is used when the published data is too large for a single Aeron message.

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

@ -53,7 +53,7 @@ open class Session<CONNECTION: SessionConnection>(@Volatile var connection: CONN
fun restore(connection: CONNECTION) {
this.connection = connection
connection.logger.debug("restoring connection")
connection.logger.debug("[{}] restoring connection", connection)
lock.withLock {
// this is called, even on a brand-new session, so we must have extra checks in place.
@ -74,7 +74,8 @@ open class Session<CONNECTION: SessionConnection>(@Volatile var connection: CONN
}
fun save(connection: CONNECTION) {
connection.logger.debug("saving connection")
connection.logger.debug("[{}] saving connection", connection)
val allProxyObjects = connection.rmi.getAllProxyObjects()
val allProxyCallbacks = connection.rmi.getAllCallbacks()
val allImplObjects = connection.rmi.getAllImplObjects()
@ -89,11 +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)
// 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.logger.error("[{}] successfully resent message", connection)
return true
}
}
@ -101,22 +104,22 @@ 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.logger.error("[{}] 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.logger.error("[{}] queueing message", connection)
}
else if (!connection.isConnected()) {
// there was an issue - the connection should automatically reconnect
pendingMessagesQueue.put(message)
connection.logger.error("queueing message")
connection.logger.error("[{}] queueing message", connection)
}
connection.logger.error("NOT NOT NOT queueing message")
connection.logger.error("[{}] NOT NOT NOT queueing message", connection)
return false
}
}

6
src/dorkbox/network/connection/session/SessionConnection.kt
View File

@ -32,10 +32,10 @@ open class SessionConnection(connectionParameters: ConnectionParams<*>): Connect
return true
}
fun sendPendingMessages() {
internal fun sendPendingMessages() {
// now send all pending messages
if (logger.isTraceEnabled) {
logger.trace("Sending pending messages: ${session.pendingMessagesQueue.size}")
if (logger.isDebugEnabled) {
logger.debug("Sending pending messages: ${session.pendingMessagesQueue.size}")
}
session.pendingMessagesQueue.forEach {
super.send(it, false)