diff options
| author | Albin <albin@mullvad.net> | 2024-06-25 16:46:31 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-06-26 12:59:29 +0200 |
| commit | cee8176be4cae9cc605cca5ffae85d243adc4f3a (patch) | |
| tree | d989a1aa16b26b1245c65f849b6f1f03e14faba0 /android/lib/daemon-grpc/src | |
| parent | 0316f672c58f5558ce9880af698098c3718591b6 (diff) | |
| download | mullvadvpn-cee8176be4cae9cc605cca5ffae85d243adc4f3a.tar.xz mullvadvpn-cee8176be4cae9cc605cca5ffae85d243adc4f3a.zip | |
Migrate log calls to kermit
Diffstat (limited to 'android/lib/daemon-grpc/src')
2 files changed, 4 insertions, 6 deletions
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt index 10c2406850..8e0963b82e 100644 --- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt +++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt @@ -1,13 +1,13 @@ package net.mullvad.mullvadvpn.lib.daemon.grpc import android.net.LocalSocketAddress -import android.util.Log import arrow.core.Either import arrow.core.raise.either import arrow.core.raise.ensure import arrow.optics.copy import arrow.optics.dsl.index import arrow.optics.typeclasses.Index +import co.touchlab.kermit.Logger import com.google.protobuf.BoolValue import com.google.protobuf.Empty import com.google.protobuf.StringValue @@ -38,7 +38,6 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import mullvad_daemon.management_interface.ManagementInterface import mullvad_daemon.management_interface.ManagementServiceGrpcKt -import net.mullvad.mullvadvpn.lib.common.constant.TAG import net.mullvad.mullvadvpn.lib.daemon.grpc.mapper.fromDomain import net.mullvad.mullvadvpn.lib.daemon.grpc.mapper.toDomain import net.mullvad.mullvadvpn.lib.daemon.grpc.util.LogInterceptor @@ -204,7 +203,7 @@ class ManagementService( launch { grpc.eventsListen(Empty.getDefaultInstance()).collect { event -> if (extensiveLogging) { - Log.d(TAG, "Event: $event") + Logger.d("Event: $event") } @Suppress("WHEN_ENUM_CAN_BE_NULL_IN_JAVA") when (event.eventCase) { diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/LogInterceptor.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/LogInterceptor.kt index fde87ecdd5..8c10e2a1ff 100644 --- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/LogInterceptor.kt +++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/LogInterceptor.kt @@ -1,12 +1,11 @@ package net.mullvad.mullvadvpn.lib.daemon.grpc.util -import android.util.Log +import co.touchlab.kermit.Logger import io.grpc.CallOptions import io.grpc.Channel import io.grpc.ClientCall import io.grpc.ClientInterceptor import io.grpc.MethodDescriptor -import net.mullvad.mullvadvpn.lib.common.constant.TAG internal class LogInterceptor : ClientInterceptor { override fun <ReqT : Any?, RespT : Any?> interceptCall( @@ -14,7 +13,7 @@ internal class LogInterceptor : ClientInterceptor { callOptions: CallOptions?, next: Channel? ): ClientCall<ReqT, RespT> { - Log.d(TAG, "Intercepted call: ${method?.fullMethodName}") + Logger.d("Intercepted call: ${method?.fullMethodName}") return next!!.newCall(method, callOptions) } } |