add logs on onCancel handlers

drpcorg · May 3, 2024 · 3d035fc · 3d035fc
1 parent 8fb39c4
commit 3d035fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/rpc/BlockchainRpc.kt b/src/main/kotlin/io/emeraldpay/dshackle/rpc/BlockchainRpc.kt
@@ -121,6 +121,8 @@ class BlockchainRpc(
                     metrics?.nativeSubscribeRespMetric?.increment()
                 }.doOnComplete {
                     log.info("Subscription ${req.subscriptionId} completed")
+                }.doOnCancel {
+                    log.info("Subscription ${req.subscriptionId} canceled")
                 }.doOnError {
                         t ->
                     log.info("Error ${t.message} in subscription ${req.subscriptionId}")

diff --git a/src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeSubscribe.kt b/src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeSubscribe.kt
@@ -56,7 +56,9 @@ open class NativeSubscribe(
                         start(it, subscriptionId)
                     }
                     .map(this@NativeSubscribe::convertToProto)
-                    .onErrorMap {
+                    .doOnCancel {
+                        log.warn("Subscription ${subscriptionId} cancelled")
+                    }.onErrorMap {
                         convertToStatus(it, subscriptionId)
                     }
             }