Martin Peřina has uploaded a new change for review. Change subject: core: Remove unnecessary String.format in logging calls ......................................................................
core: Remove unnecessary String.format in logging calls Use slf4j string formatting instead of String.format call in logging. Change-Id: I1fc06b84903db89386c51a63b1589e0d0e3a8a15 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsNotRespondingTreatmentCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMClearTaskVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMRevertTaskVDSCommand.java 5 files changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/35042/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java index 325b6c7..016ba2f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmConfigurationBySnapshotQuery.java @@ -29,7 +29,7 @@ VM vm = null; if (snapshot == null) { - log.error(String.format("Snapshot %1$s does not exist", getParameters().getId())); + log.error("Snapshot '{}' does not exist", getParameters().getId()); } else { vm = snapshotVmConfigurationHelper.getVmFromConfiguration( diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java index e5fc87a..8c9107e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java @@ -1,9 +1,8 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.bll.context.CommandContext; - import java.util.ArrayList; +import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.storage.PostZeroHandler; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.RestoreFromSnapshotParameters; @@ -122,7 +121,7 @@ catch (VdcBLLException e) { // Set fault for parent command RestoreAllSnapshotCommand to use, if decided to fail the command. getReturnValue().setFault(new VdcFault(e, e.getVdsError().getCode())); - log.info(String.format("%1$s Image not exist in Irs", getDiskImage().getImageId())); + log.info("Image '{}' not exist in Irs", getDiskImage().getImageId()); } return vdsReturnValue; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsNotRespondingTreatmentCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsNotRespondingTreatmentCommand.java index 6a94a5b..3a81c3a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsNotRespondingTreatmentCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsNotRespondingTreatmentCommand.java @@ -134,7 +134,7 @@ long difference = System.currentTimeMillis() - getParameters().getLastUpdate(); if (difference < interval) { int sleepMs = (int)(interval - difference); - log.info(String.format("Sleeping %s ms before proceeding with fence execution", sleepMs)); + log.info("Sleeping {} ms before proceeding with fence execution", sleepMs); ThreadUtils.sleep(sleepMs); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMClearTaskVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMClearTaskVDSCommand.java index 1975a8d..9c380cf 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMClearTaskVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMClearTaskVDSCommand.java @@ -20,7 +20,7 @@ switch (returnStatus) { case UnknownTask: - log.error(String.format("Trying to remove unknown task: %1$s", getParameters().getTaskId())); + log.error("Trying to remove unknown task '{}'", getParameters().getTaskId()); return; case TaskStateError: initializeVdsError(returnStatus); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMRevertTaskVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMRevertTaskVDSCommand.java index 9c3389a..975c523 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMRevertTaskVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMRevertTaskVDSCommand.java @@ -20,7 +20,7 @@ switch (returnStatus) { case UnknownTask: - log.error(String.format("Trying to revert unknown task: %1$s", getParameters().getTaskId())); + log.error("Trying to revert unknown task '{}'", getParameters().getTaskId()); return; } super.proceedProxyReturnValue(); -- To view, visit http://gerrit.ovirt.org/35042 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1fc06b84903db89386c51a63b1589e0d0e3a8a15 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
