From e3546a5109090175772f4e1285c22b51cba46e1b Mon Sep 17 00:00:00 2001 From: Stoyan Tzenkov Date: Thu, 24 Jan 2019 09:43:17 +0200 Subject: [PATCH 1/2] NY-4662: No account details in the log Signed-off-by: Stoyan Tzenkov --- .../account/services/AccountServiceImpl.java | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java index 8f06131..59bff97 100644 --- a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java +++ b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java @@ -159,7 +159,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas return; } AccountResponse response = accountResponse.get(); - logger.info("SUCCESS: Found account by provider {}: \"{}\"", request.getAuthenticationIdentifier(), response); + logger.info("SUCCESS: Found account by provider {}: ", request.getAuthenticationIdentifier()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -271,7 +271,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas } AccountResponse response = accountResponse.get(); - logger.info("SUCCESS: Found result for account by username {}: \"{}\"", request.getUsername(), response); + logger.info("SUCCESS: Found result for account by username {}.", request.getUsername()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -353,7 +353,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas return; } AccountResponse response = accountResponse.get(); - logger.info("SUCCESS: Found result for account by QR code {}: \"{}\"", request.getQrCode(), response); + logger.info("SUCCESS: Found result for account by QR code {}.", request.getQrCode()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -409,7 +409,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas return; } AccountsResponse response = accounts.get(); - logger.info("SUCCESS: Found result for account by profile ID {}: \"{}\"", request.getProfileId(), response); + logger.info("SUCCESS: Found result for account by profile ID {}.", request.getProfileId()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -447,7 +447,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas return; } AccountResponse response = account.get(); - logger.info("SUCCESS: Found result for account by account ID {}: \"{}\"", request.getAccountId(), response); + logger.info("SUCCESS: Found result for account by account ID {}.", request.getAccountId()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -471,6 +471,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas response = accountCreator.retrieveCreatePendingAccountResponse(request); } + logger.info("SUCCESS: Created pending account for provider {}.", request.getAuthenticationProvider()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -486,8 +487,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas AccountResponse response = accountCreator.retrieveCompletePendingAccountResponse(request); - logger.info("SUCCESS: Completed pending account creattion for account ID {}: \"{}\"", request.getAccountId(), - response); + logger.info("SUCCESS: Completed pending account creattion for account ID {}.", request.getAccountId()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -536,8 +536,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas "", Cause.ERROR_UPDATING_ACCOUNT); return; } - logger.info("SUCCESS: Account \"{}\" updated in the DB", updatedAccount.toString()); - logger.info("SUCCESS: Account: \"{}\" updated successfully.", updatedAccount); + logger.info("SUCCESS: Account \"{}\" updated in the DB", updatedAccount.getAccountId()); AccountResponse response = AccountResponse.newBuilder().setAccountDetails(updatedAccount.toProto()).build(); responseObserver.onNext(response); responseObserver.onCompleted(); @@ -956,7 +955,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas return; } ProfileResponse response = profile.get(); - logger.info("SUCCESS: Found profile by profile ID {}: \"{}\"", request.getProfileId(), response); + logger.info("SUCCESS: Found profile by profile ID {}.", request.getProfileId()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -1137,8 +1136,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas "", Cause.ACCOUNT_NOT_FOUND); } else { AccountResponse response = account.get(); - logger.info("SUCCESS: Found account by login option {}: \"{}\"", request.getAuthenticationIdentifier(), - response); + logger.info("SUCCESS: Found account by login option {}.", request.getAuthenticationIdentifier()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -1193,8 +1191,8 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas account.get().getAvatar(), account.get().getFirstName(), account.get().getLastName()); SearchResponse response = SearchResponse.newBuilder().setSearchResultDetails(searchResultDetails).build(); - logger.info("SUCCESS: Found result for account by social provider {}: \"{}\"", - request.getAuthenticationIdentifier(), response); + logger.info("SUCCESS: Found result for account by social provider {}.", + request.getAuthenticationIdentifier()); responseObserver.onNext(response); responseObserver.onCompleted(); } -- GitLab From 3928a82637c61fbf520ce7b64b715fd0bf053943 Mon Sep 17 00:00:00 2001 From: Stoyan Tzenkov Date: Fri, 25 Jan 2019 16:06:46 +0200 Subject: [PATCH 2/2] NY-4662: Account Id added to log whereever possible. Signed-off-by: Stoyan Tzenkov --- .../nynja/account/services/AccountServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java index 59bff97..4b42261 100644 --- a/src/main/java/biz/nynja/account/services/AccountServiceImpl.java +++ b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java @@ -271,7 +271,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas } AccountResponse response = accountResponse.get(); - logger.info("SUCCESS: Found result for account by username {}.", request.getUsername()); + logger.info("SUCCESS: Found result for account by username {}. Account Id = {}.", request.getUsername(), response.getAccountDetails().getAccountId()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -353,7 +353,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas return; } AccountResponse response = accountResponse.get(); - logger.info("SUCCESS: Found result for account by QR code {}.", request.getQrCode()); + logger.info("SUCCESS: Found result for account by QR code {}. Account Id={}.", request.getQrCode(), response.getAccountDetails().getAccountId()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -471,7 +471,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas response = accountCreator.retrieveCreatePendingAccountResponse(request); } - logger.info("SUCCESS: Created pending account for provider {}.", request.getAuthenticationProvider()); + logger.info("SUCCESS: Created pending account for provider {} and accoutn Id {}.", request.getAuthenticationProvider(), response.getPendingAccountDetails().getAccountId()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -487,7 +487,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas AccountResponse response = accountCreator.retrieveCompletePendingAccountResponse(request); - logger.info("SUCCESS: Completed pending account creattion for account ID {}.", request.getAccountId()); + logger.info("SUCCESS: Completed pending account creation for account ID {}.", request.getAccountId()); responseObserver.onNext(response); responseObserver.onCompleted(); } @@ -602,7 +602,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas wasProfileDeleted.get()); return; } - logger.info("SUCCESS: The profile was deleted successfully."); + logger.info("SUCCESS: Profile with Id {} was deleted successfully.", request.getProfileId()); responseObserver.onNext(StatusResponse.newBuilder().setStatus("SUCCESS").build()); responseObserver.onCompleted(); } @@ -1136,7 +1136,7 @@ public class AccountServiceImpl extends AccountServiceGrpc.AccountServiceImplBas "", Cause.ACCOUNT_NOT_FOUND); } else { AccountResponse response = account.get(); - logger.info("SUCCESS: Found account by login option {}.", request.getAuthenticationIdentifier()); + logger.info("SUCCESS: Found account by login option {}. Account Id={}.", request.getAuthenticationIdentifier(), response.getAccountDetails().getAccountId()); responseObserver.onNext(response); responseObserver.onCompleted(); } -- GitLab