Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Truncate hex strings in front logs #1679

Merged
merged 1 commit into from
Feb 4, 2021
Merged

Truncate hex strings in front logs #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eclair-core/src/main/scala/fr/acinq/eclair/crypto/TransportHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ class TransportHandler[T: ClassTag](keyPair: KeyPair, rs: Option[ByteVector], co

case Event(t: T, d: NormalData[T]) =>
if (d.sendBuffer.normalPriority.size + d.sendBuffer.lowPriority.size >= MAX_BUFFERED) {
log.warning(s"send buffer overrun, closing connection")
log.warning("send buffer overrun, closing connection")
connection ! PoisonPill
stop(FSM.Normal)
} else if (d.unackedSent.isDefined) {
Expand Down
5 changes: 4 additions & 1 deletion eclair-core/src/main/scala/fr/acinq/eclair/wire/LightningMessageTypes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,10 @@ object EncodingType {
}
// @formatter:on

case class EncodedShortChannelIds(encoding: EncodingType, array: List[ShortChannelId])
case class EncodedShortChannelIds(encoding: EncodingType, array: List[ShortChannelId]) {
/** custom toString because it can get huge in logs */
override def toString: String = s"EncodedShortChannelIds($encoding,${array.headOption.getOrElse("")}->${array.lastOption.getOrElse("")} size=${array.size})"
}

case class QueryShortChannelIds(chainHash: ByteVector32,
shortChannelIds: EncodedShortChannelIds,
Expand Down
5 changes: 4 additions & 1 deletion eclair-core/src/main/scala/fr/acinq/eclair/wire/QueryShortChannelIdsTlv.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ object QueryShortChannelIdsTlv {
* @param encoding 0 means uncompressed, 1 means compressed with zlib
* @param array array of query flags, each flags specifies the info we want for a given channel
*/
case class EncodedQueryFlags(encoding: EncodingType, array: List[Long]) extends QueryShortChannelIdsTlv
case class EncodedQueryFlags(encoding: EncodingType, array: List[Long]) extends QueryShortChannelIdsTlv {
/** custom toString because it can get huge in logs */
override def toString: String = s"EncodedQueryFlags($encoding, size=${array.size})"
}

case object QueryFlagType {
val INCLUDE_CHANNEL_ANNOUNCEMENT: Long = 1
Expand Down
12 changes: 9 additions & 3 deletions eclair-core/src/main/scala/fr/acinq/eclair/wire/ReplyChannelRangeTlv.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.acinq.eclair.wire

import fr.acinq.eclair.{UInt64, wire}
import fr.acinq.eclair.UInt64
import fr.acinq.eclair.wire.CommonCodecs.{varint, varintoverflow}
import scodec.Codec
import scodec.codecs._
Expand All @@ -22,7 +22,10 @@ object ReplyChannelRangeTlv {
* @param encoding same convention as for short channel ids
* @param timestamps
*/
case class EncodedTimestamps(encoding: EncodingType, timestamps: List[Timestamps]) extends ReplyChannelRangeTlv
case class EncodedTimestamps(encoding: EncodingType, timestamps: List[Timestamps]) extends ReplyChannelRangeTlv {
/** custom toString because it can get huge in logs */
override def toString: String = s"EncodedTimestamps($encoding, size=${timestamps.size})"
}

/**
*
Expand All @@ -36,7 +39,10 @@ object ReplyChannelRangeTlv {
*
* @param checksums
*/
case class EncodedChecksums(checksums: List[Checksums]) extends ReplyChannelRangeTlv
case class EncodedChecksums(checksums: List[Checksums]) extends ReplyChannelRangeTlv {
/** custom toString because it can get huge in logs */
override def toString: String = s"EncodedChecksums(size=${checksums.size})"
}

val timestampsCodec: Codec[Timestamps] = (
("timestamp1" | uint32) ::
Expand Down
6 changes: 4 additions & 2 deletions eclair-front/modules/awseb/logback_eb.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
return formattedMessage.contains("connected to /10.") ||
(formattedMessage.contains("connection closed") && !mdc.containsKey("nodeId")) ||
(formattedMessage.contains("transport died") && !mdc.containsKey("nodeId")) ||
(formattedMessage.contains("stopping") && !mdc.containsKey("nodeId"));
(formattedMessage.contains("stopping") && !mdc.containsKey("nodeId")) ||
(formattedMessage.contains("buffering send data"));
</expression>
</evaluator>
<OnMismatch>NEUTRAL</OnMismatch>
Expand All @@ -34,7 +35,8 @@
<target>System.out</target>
<withJansi>false</withJansi>
<encoder>
<pattern>${HOSTNAME} %d %-5level %logger{24}%X{category}%X{nodeId}%X{channelId}%X{paymentHash}%.-11X{parentPaymentId}%.-11X{paymentId} - %msg%ex{12}%n</pattern>
<!-- the 'replace' conversion word strips the end of 64+ hexadecimal strings and keeps only the first 8 characters -->
<pattern>${HOSTNAME} %d %-5level %replace(%logger{24}%X{category}%X{nodeId}%X{channelId}%X{paymentHash}%.-11X{parentPaymentId}%.-11X{paymentId} - %msg){'(?&lt;=[a-f0-9]{8})[a-f0-9]{56,}', ''}%ex{12}%n</pattern>
</encoder>
</appender>

Expand Down