Rationalize logging statements across codebase

This fixes up the following problems:
1. Using string concatenation instead of the formatting variant methods.
2. Logging or swallowing exception messages without logging the exception
   itself (this swallows the stack trace).
3. Unnecessary logging on re-thrown exceptions.
4. Unnecessary use of formatting variant methods when not necessary.
5. Complicated logging statements involving significant processing not being
   wrapped inside of a logging level check.
6. Redundant logging both of an exception itself and its message (this is
   unnecessary duplication).
7. Use of the base Logger class instead of our FormattingLogger class.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=182419837
This commit is contained in:
mcilwain 2018-01-18 12:27:06 -08:00 committed by Ben McIlwain
parent f22a42cd42
commit 81dc2bbbc3
47 changed files with 172 additions and 154 deletions

View file

@ -32,6 +32,6 @@ class LogoutCommand implements Command {
@Override
public void run() throws IOException {
StoredCredential.getDefaultDataStore(dataStoreFactory).clear();
logger.infofmt("Logged out - credentials have been removed.");
logger.info("Logged out - credentials have been removed.");
}
}

View file

@ -110,7 +110,7 @@ public class CreateGroupsAction implements Runnable {
} else {
response.setStatus(SC_OK);
response.setPayload("Success!");
logger.info("Successfully created groups for registrar: " + registrar.getRegistrarName());
logger.infofmt("Successfully created groups for registrar: %s", registrar.getRegistrarName());
}
}

View file

@ -38,9 +38,9 @@ public abstract class CreateOrUpdatePremiumListAction implements Runnable {
public void run() {
try {
savePremiumList();
} catch (IllegalArgumentException iae) {
logger.info(iae, "Usage error in attempting to save premium list from nomulus tool command");
response.setPayload(ImmutableMap.of("error", iae.toString(), "status", "error"));
} catch (IllegalArgumentException e) {
logger.info(e, "Usage error in attempting to save premium list from nomulus tool command");
response.setPayload(ImmutableMap.of("error", e.toString(), "status", "error"));
} catch (Exception e) {
logger.severe(e, "Unexpected error saving premium list from nomulus tool command");
response.setPayload(ImmutableMap.of("error", e.toString(), "status", "error"));

View file

@ -112,8 +112,8 @@ public class DeleteEntityAction implements Runnable {
try {
return Optional.ofNullable(getDatastoreService().get(rawKey));
} catch (EntityNotFoundException e) {
logger.warningfmt(e, "Could not load entity from Datastore service with key %s",
rawKey.toString());
logger.warningfmt(
e, "Could not load entity from Datastore service with key %s", rawKey.toString());
return Optional.empty();
}
}

View file

@ -121,13 +121,13 @@ public abstract class ListObjectsAction<T extends ImmutableObject> implements Ru
"lines", lines,
"status", "success"));
} catch (IllegalArgumentException e) {
String message = firstNonNull(e.getMessage(), e.getClass().getName());
logger.warning(e, message);
logger.warning(e, "Error while listing objects.");
// Don't return a non-200 response, since that will cause RegistryTool to barf instead of
// letting ListObjectsCommand parse the JSON response and return a clean error.
response.setPayload(ImmutableMap.of(
"error", message,
"status", "error"));
response.setPayload(
ImmutableMap.of(
"error", firstNonNull(e.getMessage(), e.getClass().getName()),
"status", "error"));
}
}