zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-22 18:55:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rationalize logging statements across codebase

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
java/google/registry/backup/CommitLogCheckpointAction.java
View file

@ -62,13 +62,13 @@ public final class CommitLogCheckpointAction implements Runnable {
@Override
public void run() {
final CommitLogCheckpoint checkpoint = strategy.computeCheckpoint();
logger.info("Generated candidate checkpoint for time " + checkpoint.getCheckpointTime());
logger.infofmt("Generated candidate checkpoint for time: %s", checkpoint.getCheckpointTime());
ofy()
.transact(
() -> {
DateTime lastWrittenTime = CommitLogCheckpointRoot.loadRoot().getLastWrittenTime();
if (isBeforeOrAt(checkpoint.getCheckpointTime(), lastWrittenTime)) {
logger.info("Newer checkpoint already written at time: " + lastWrittenTime);
logger.infofmt("Newer checkpoint already written at time: %s", lastWrittenTime);
return;
}
ofy()

13
java/google/registry/backup/GcsDiffFileLister.java
View file

@ -68,13 +68,13 @@ class GcsDiffFileLister {
metadata = Futures.getUnchecked(upperBoundTimesToMetadata.get(checkpointTime));
} else {
String filename = DIFF_FILE_PREFIX + checkpointTime;
logger.info("Patching GCS list; discovered file " + filename);
logger.infofmt("Patching GCS list; discovered file: %s", filename);
metadata = getMetadata(filename);
// If we hit a gap, quit.
if (metadata == null) {
logger.infofmt(
"Gap discovered in sequence terminating at %s, missing file %s",
"Gap discovered in sequence terminating at %s, missing file: %s",
sequence.lastKey(),
filename);
logger.infofmt("Found sequence from %s to %s", checkpointTime, lastTime);
@ -89,9 +89,9 @@ class GcsDiffFileLister {
}
ImmutableList<GcsFileMetadata> listDiffFiles(DateTime fromTime, @Nullable DateTime toTime) {
logger.info("Requested restore from time: " + fromTime);
logger.infofmt("Requested restore from time: %s", fromTime);
if (toTime != null) {
logger.info(" Until time: " + toTime);
logger.infofmt(" Until time: %s", toTime);
}
// List all of the diff files on GCS and build a map from each file's upper checkpoint time
// (extracted from the filename) to its asynchronously-loaded metadata, keeping only files with
@ -130,7 +130,7 @@ class GcsDiffFileLister {
// last file and work backwards we can verify that we have no holes in our chain (although we
// may be missing files at the end).
TreeMap<DateTime, GcsFileMetadata> sequence = new TreeMap<>();
logger.info("Restoring until: " + lastUpperBoundTime);
logger.infofmt("Restoring until: %s", lastUpperBoundTime);
boolean inconsistentFileSet = !constructDiffSequence(
upperBoundTimesToMetadata, fromTime, lastUpperBoundTime, sequence);
@ -157,7 +157,8 @@ class GcsDiffFileLister {
"Unable to compute commit diff history, there are either gaps or forks in the history "
+ "file set. Check log for details.");
logger.info("Actual restore from time: " + getLowerBoundTime(sequence.firstEntry().getValue()));
logger.infofmt(
"Actual restore from time: %s", getLowerBoundTime(sequence.firstEntry().getValue()));
logger.infofmt("Found %d files to restore", sequence.size());
return ImmutableList.copyOf(sequence.values());
}