From b01fa6b4c90de772d856b7131dba1df1232581da Mon Sep 17 00:00:00 2001 From: mcilwain Date: Fri, 20 Oct 2017 08:55:59 -0700 Subject: [PATCH] Use more efficient logging statements The infofmt versions only perform string concatenation if info logging is turned on, rather than doing so all of the time. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=172889338 --- .../registry/backup/RestoreCommitLogsAction.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/google/registry/backup/RestoreCommitLogsAction.java b/java/google/registry/backup/RestoreCommitLogsAction.java index 13d1bd139..02a5a323f 100644 --- a/java/google/registry/backup/RestoreCommitLogsAction.java +++ b/java/google/registry/backup/RestoreCommitLogsAction.java @@ -100,7 +100,7 @@ public class RestoreCommitLogsAction implements Runnable { Map bucketTimestamps = new HashMap<>(); CommitLogCheckpoint lastCheckpoint = null; for (GcsFileMetadata metadata : diffFiles) { - logger.info("Restoring: " + metadata.getFilename().getObjectName()); + logger.infofmt("Restoring: %s", metadata.getFilename().getObjectName()); try (InputStream input = Channels.newInputStream( gcsService.openPrefetchingReadChannel(metadata.getFilename(), 0, BLOCK_SIZE))) { PeekingIterator commitLogs = @@ -160,7 +160,7 @@ public class RestoreCommitLogsAction implements Runnable { private void saveRaw(final List entitiesToSave) { if (dryRun) { - logger.info("Would have saved " + entitiesToSave); + logger.infofmt("Would have saved entities: %s", entitiesToSave); return; } retry(() -> datastoreService.put(entitiesToSave)); @@ -168,7 +168,7 @@ public class RestoreCommitLogsAction implements Runnable { private void saveOfy(final Iterable objectsToSave) { if (dryRun) { - logger.info("Would have saved " + asList(objectsToSave)); + logger.infofmt("Would have saved entities: %s", objectsToSave); return; } retry(() -> ofy().saveWithoutBackup().entities(objectsToSave).now()); @@ -176,12 +176,12 @@ public class RestoreCommitLogsAction implements Runnable { private Result deleteAsync(Set> keysToDelete) { if (dryRun) { - logger.info("Would have deleted " + keysToDelete); + logger.infofmt("Would have deleted entities: %s", keysToDelete); } return dryRun || keysToDelete.isEmpty() ? new ResultNow(null) : ofy().deleteWithoutBackup().keys(keysToDelete); - } + } /** Retrier for saves and deletes, since we can't proceed with any failures. */ private void retry(final Runnable runnable) {