From 14ddd1ed55e98602bb4921758a0766f32ffb2e36 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sun, 7 Nov 2021 21:06:36 +0300 Subject: [PATCH] Fix error logging with Timber --- .../java/gq/kirmanak/mealie/data/auth/AuthDataSourceImpl.kt | 2 +- .../gq/kirmanak/mealie/data/recipes/RecipesRemoteMediator.kt | 4 ++-- .../gq/kirmanak/mealie/ui/auth/AuthenticationViewModel.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthDataSourceImpl.kt b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthDataSourceImpl.kt index f64ab4b..0eddad1 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthDataSourceImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthDataSourceImpl.kt @@ -20,7 +20,7 @@ class AuthDataSourceImpl @Inject constructor( val response = try { authService.getToken(username, password) } catch (e: Exception) { - Timber.e("Authenticate() exception", e) + Timber.e(e, "Authenticate() exception") return Result.failure(e) } Timber.d("authenticate() response is $response") diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipesRemoteMediator.kt b/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipesRemoteMediator.kt index 5ca555a..afb7db7 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipesRemoteMediator.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipesRemoteMediator.kt @@ -36,7 +36,7 @@ class RecipesRemoteMediator @Inject constructor( val recipes = try { network.requestRecipes(start = start, end = end) } catch (e: Exception) { - Timber.e("Can't load recipes", e) + Timber.e(e, "Can't load recipes") return MediatorResult.Error(e) } @@ -46,7 +46,7 @@ class RecipesRemoteMediator @Inject constructor( PREPEND, APPEND -> storage.saveRecipes(recipes) } } catch (e: Exception) { - Timber.e("Can't save recipes", e) + Timber.e(e, "Can't save recipes") return MediatorResult.Error(e) } val expectedCount = end - start diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationViewModel.kt b/app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationViewModel.kt index df457f0..13c63f9 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationViewModel.kt +++ b/app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationViewModel.kt @@ -25,7 +25,7 @@ class AuthenticationViewModel @Inject constructor( Timber.v("authenticate() called with: username = $username, password = $password, baseUrl = $baseUrl") val result = authRepo.authenticate(username, password, baseUrl) if (result == null) Timber.d("authenticate() returns null") - else Timber.e("authenticate() returns error", result) + else Timber.e(result, "authenticate() returns error") return result } } \ No newline at end of file