From a46b456a25fe35b15f7688f921e0d44838a0dae3 Mon Sep 17 00:00:00 2001
From: a10zn8 <a1.cyb3r@gmail.com>
Date: Thu, 19 Jan 2023 17:59:49 +0400
Subject: [PATCH] improve logging - log merged head stop - add network name to
 label - log only non-empty deltas of grpc upstreams changes

---
 .../io/emeraldpay/dshackle/upstream/DynamicMergedHead.kt      | 1 +
 .../dshackle/upstream/ethereum/EthereumMultistream.kt         | 2 +-
 .../dshackle/upstream/ethereum_pos/EthereumPosMultiStream.kt  | 2 +-
 .../io/emeraldpay/dshackle/upstream/grpc/GrpcUpstreams.kt     | 4 +++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/DynamicMergedHead.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/DynamicMergedHead.kt
index 967bd39b..0a6a01c1 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/DynamicMergedHead.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/DynamicMergedHead.kt
@@ -34,6 +34,7 @@ open class DynamicMergedHead(
 
     override fun stop() {
         super.stop()
+        log.info("Stop dynamic merged head for [$label]")
         dynamicFlux.stop()
         subscription?.dispose()
         subscription = null
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumMultistream.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumMultistream.kt
index 2ae8cebd..5c8af8fe 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumMultistream.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumMultistream.kt
@@ -48,7 +48,7 @@ open class EthereumMultistream(
 
     private var head: DynamicMergedHead = DynamicMergedHead(
         PriorityForkChoice(),
-        "ETH Multistream",
+        "ETH Multistream of ${chain.chainCode}",
         headScheduler
     )
 
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum_pos/EthereumPosMultiStream.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum_pos/EthereumPosMultiStream.kt
index e9aa7d38..b5b8badc 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum_pos/EthereumPosMultiStream.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum_pos/EthereumPosMultiStream.kt
@@ -47,7 +47,7 @@ open class EthereumPosMultiStream(
 
     private var head: DynamicMergedHead = DynamicMergedHead(
         PriorityForkChoice(),
-        "ETH Pos Multistream",
+        "ETH Pos Multistream of ${chain.chainCode}",
         headScheduler
     )
 
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/grpc/GrpcUpstreams.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/grpc/GrpcUpstreams.kt
index 27243cb3..13035eb6 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/grpc/GrpcUpstreams.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/grpc/GrpcUpstreams.kt
@@ -155,7 +155,9 @@ class GrpcUpstreams(
         }.map {
             UpstreamChangeEvent(it.key, known.remove(it.key)!!, UpstreamChangeEvent.ChangeType.REMOVED)
         }
-        log.info("Finished processing of grpc upstream description for $id with content delta added [${added.map { it.chain }}] and removed [${removed.map { it.chain }}]")
+        if (removed.isNotEmpty() || added.isNotEmpty()) {
+            log.info("Finished processing of grpc upstream description for $id with content delta added ${added.map { it.chain }} and removed ${removed.map { it.chain }}")
+        }
         return Flux.fromIterable(removed + added)
     }