From 9514bd18c07abba54c5d3ff32100ca0f61fd5ee3 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Thu, 14 Jun 2018 19:55:07 +0200 Subject: [PATCH] More heartbeat debug info --- .../main/java/de/kuschku/libquassel/session/HeartBeatThread.kt | 3 ++- lib/src/main/java/de/kuschku/libquassel/session/Session.kt | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/de/kuschku/libquassel/session/HeartBeatThread.kt b/lib/src/main/java/de/kuschku/libquassel/session/HeartBeatThread.kt index 21bc9c549..cd33b4021 100644 --- a/lib/src/main/java/de/kuschku/libquassel/session/HeartBeatThread.kt +++ b/lib/src/main/java/de/kuschku/libquassel/session/HeartBeatThread.kt @@ -15,9 +15,10 @@ class HeartBeatThread(private val session: Session) : Thread() { val now = Instant.now() val duration = Duration.between(lastHeartBeatReply, now).toMillis() if (duration > TIMEOUT) { - log(INFO, "Session", "Ping Timeout: Last Response ${duration}ms ago") + log(INFO, "Heartbeat", "Ping Timeout: Last Response ${duration}ms ago") session.close() } else { + log(INFO, "Heartbeat", "Sending Heartbeat") session.dispatch(SignalProxyMessage.HeartBeat(now)) } } diff --git a/lib/src/main/java/de/kuschku/libquassel/session/Session.kt b/lib/src/main/java/de/kuschku/libquassel/session/Session.kt index 361c20670..e2dabf554 100644 --- a/lib/src/main/java/de/kuschku/libquassel/session/Session.kt +++ b/lib/src/main/java/de/kuschku/libquassel/session/Session.kt @@ -27,6 +27,8 @@ import de.kuschku.libquassel.quassel.ExtendedFeature import de.kuschku.libquassel.quassel.QuasselFeatures import de.kuschku.libquassel.quassel.syncables.* import de.kuschku.libquassel.util.compatibility.HandlerService +import de.kuschku.libquassel.util.compatibility.LoggingHandler +import de.kuschku.libquassel.util.compatibility.LoggingHandler.Companion.log import io.reactivex.BackpressureStrategy import io.reactivex.Observable import io.reactivex.subjects.BehaviorSubject @@ -239,6 +241,7 @@ class Session( val now = Instant.now() heartBeatThread.setLastHeartBeatReply(f.timestamp) val latency = now.toEpochMilli() - f.timestamp.toEpochMilli() + log(LoggingHandler.LogLevel.INFO, "Heartbeat", "Received Heartbeat with ${latency}ms latency") lag.onNext(latency) return true } -- GitLab