From 6c9f788908f8b281240b1cf52428dfcc76df5f7b Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Thu, 28 Sep 2017 02:37:46 +0200 Subject: [PATCH] Fixed a bug with logging issues --- .../de/kuschku/libquassel/session/CoreConnection.kt | 4 ++-- .../de/kuschku/libquassel/session/ProtocolHandler.kt | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/src/main/java/de/kuschku/libquassel/session/CoreConnection.kt b/lib/src/main/java/de/kuschku/libquassel/session/CoreConnection.kt index 398a9f30f..652f3dadb 100644 --- a/lib/src/main/java/de/kuschku/libquassel/session/CoreConnection.kt +++ b/lib/src/main/java/de/kuschku/libquassel/session/CoreConnection.kt @@ -60,7 +60,7 @@ class CoreConnection( } fun setState(value: ConnectionState) { - log(INFO, "CoreConnection", value.name) + log(INFO, TAG, value.name) internalState.onNext(value) } @@ -84,7 +84,7 @@ class CoreConnection( sizeBuffer.flip() val protocol = ProtocolInfoSerializer.deserialize(sizeBuffer, session.coreFeatures) - log(DEBUG, "Protocol negotiated $protocol") + log(DEBUG, TAG, "Protocol negotiated $protocol") // Wrap socket in SSL context if ssl is enabled if (protocol.flags.hasFlag(ProtocolFeature.TLS)) { diff --git a/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt b/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt index c8fefde5c..d86c73a3b 100644 --- a/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt +++ b/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt @@ -31,11 +31,10 @@ abstract class ProtocolHandler : SignalProxy, AuthHandler, Closeable { override fun handle(f: SignalProxyMessage): Boolean { try { if (!super<SignalProxy>.handle(f)) { - log(DEBUG, "No receiver registered for $f") + log(DEBUG, "ProtocolHandler", "No receiver registered for $f") } } catch (e: Throwable) { - log(WARN, "ProtocolHandler", - "Error Handling SignalProxyMessage", e) + log(WARN, "ProtocolHandler", "Error Handling SignalProxyMessage", e) } return true } @@ -43,11 +42,10 @@ abstract class ProtocolHandler : SignalProxy, AuthHandler, Closeable { override fun handle(f: HandshakeMessage): Boolean { try { if (!super<AuthHandler>.handle(f)) { - log(DEBUG, "No receiver registered for $f") + log(DEBUG, "ProtocolHandler", "No receiver registered for $f") } } catch (e: Throwable) { - log(WARN, "ProtocolHandler", - "Error Handling HandshakeMessage", e) + log(WARN, "ProtocolHandler", "Error Handling HandshakeMessage", e) } return true } -- GitLab