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

Limit logging messages for RMI when args are long.

This commit is contained in:
Robinson 2023-09-14 11:47:30 +02:00
parent b2b6cfdc10
commit 00a1f4c66b
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dorkbox/network/rmi/RmiManagerGlobal.kt
View File

@ -164,13 +164,14 @@ internal class RmiManagerGlobal<CONNECTION: Connection>(logger: Logger) : RmiObj
if (logger.isTraceEnabled) {
var argString = ""
if (args != null && args.isNotEmpty()) {
if (!args.isNullOrEmpty()) {
// long byte arrays have SERIOUS problems!
argString = Arrays.deepToString(args.map {
if (it is ByteArray && it.size > 256) {
"ByteArray(length=${it.size})"
} else {
it
when (it) {
is ByteArray -> { "${it::class.java.simpleName}(length=${it.size})"}
is Array<*> -> { "${it::class.java.simpleName}(length=${it.size})"}
is Collection<*> -> { "${it::class.java.simpleName}(length=${it.size})"}
else -> { it }
}
}.toTypedArray())
argString = argString.substring(1, argString.length - 1)

20
src/dorkbox/network/rmi/messages/MethodRequest.kt
View File

@ -1,5 +1,5 @@
/*
* Copyright 2020 dorkbox, llc
* Copyright 2023 dorkbox, llc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -17,6 +17,7 @@ package dorkbox.network.rmi.messages
import dorkbox.network.rmi.CachedMethod
import dorkbox.network.rmi.RmiUtils
import java.util.*
/**
* Internal message to invoke methods remotely.
@ -47,6 +48,21 @@ class MethodRequest : RmiMessage {
var args: Array<Any>? = null
override fun toString(): String {
return "MethodRequest(isGlobal=$isGlobal, rmiObjectId=${RmiUtils.unpackLeft(packedId)}, rmiId=${RmiUtils.unpackRight(packedId)}, cachedMethod=$cachedMethod, args=${args?.contentToString()})"
var argString = ""
val args1 = args
if (!args1.isNullOrEmpty()) {
// long byte arrays have SERIOUS problems!
argString = Arrays.deepToString(args1.map {
when (it) {
is ByteArray -> { "${it::class.java.simpleName}(length=${it.size})"}
is Array<*> -> { "${it::class.java.simpleName}(length=${it.size})"}
is Collection<*> -> { "${it::class.java.simpleName}(length=${it.size})"}
else -> { it }
}
}.toTypedArray())
argString = argString.substring(1, argString.length - 1)
}
return "MethodRequest(isGlobal=$isGlobal, rmiObjectId=${RmiUtils.unpackLeft(packedId)}, rmiId=${RmiUtils.unpackRight(packedId)}, cachedMethod=$cachedMethod, args=${argString})"
}
}