Martin Peřina has uploaded a new change for review. Change subject: core: Remove usage of ExceptionUtils.getMessage ......................................................................
core: Remove usage of ExceptionUtils.getMessage Removes usage of ExceptionUtils.getMessage, because using Exception.getMessage along with logging stacktrace is enough. Change-Id: I113d01c167397456c0cc7b12a112971e482cf56d Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/LoggedUtils.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 7 files changed, 9 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/34668/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index 35ccff5..ce1dcc9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -21,7 +21,6 @@ import org.apache.commons.collections.KeyValue; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.aaa.AuthenticationProfileRepository; import org.ovirt.engine.api.extensions.aaa.Acct; import org.ovirt.engine.core.aaa.AcctUtils; @@ -160,8 +159,7 @@ try { Thread.sleep(waitBetweenInterval); } catch (InterruptedException e) { - log.warn("Failed to wait between connection polling attempts. " + - "Original exception is: {}", ExceptionUtils.getMessage(e)); + log.warn("Failed to wait between connection polling attempts", e); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index 206db85..90a09bd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -18,7 +18,6 @@ import javax.transaction.Transaction; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.bll.aaa.SessionDataContainer; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.context.CompensationContext; @@ -599,9 +598,7 @@ * The exception to log. */ protected void logExceptionAndCompensate(Exception e) { - log.error("Exception while wrapping-up compensation in endAction: {}.", - ExceptionUtils.getMessage(e)); - log.error("Exception", e); + log.error("Exception while wrapping-up compensation in endAction", e); compensate(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java index 410dfbf..8b71939 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.memory.LiveSnapshotMemoryImageBuilder; import org.ovirt.engine.core.bll.memory.MemoryImageBuilder; @@ -429,8 +428,8 @@ } private void handleVdsLiveSnapshotFailure(VdcBLLException e) { - log.warn("Could not perform live snapshot due to error, VM will still be configured to the new created snapshot: {}", - ExceptionUtils.getMessage(e)); + log.warn("Could not perform live snapshot due to error, VM will still be configured to the new created snapshot", + e); addCustomValue("SnapshotName", getSnapshotName()); addCustomValue("VmName", getVmName()); updateCallStackFromThrowable(e); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java index b2824ab..6d6a444 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java @@ -7,7 +7,6 @@ import java.util.regex.Matcher; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.InstallVdsParameters; @@ -80,7 +79,7 @@ log.error( "Cannot get canonical path to '{}': {}", iso.getName(), - ExceptionUtils.getMessage(e) + e.getMessage() ); log.debug("Exception", e); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java index 1d4b74f..48a4777 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java @@ -4,7 +4,6 @@ import java.util.Arrays; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.common.backendinterfaces.BaseHandler; import org.ovirt.engine.core.common.businessentities.EditableField; import org.ovirt.engine.core.common.businessentities.EditableOnVdsStatus; @@ -83,7 +82,7 @@ vds.getId(), vds.getName(), vds.getHostOs(), - ExceptionUtils.getMessage(e)); + e.getMessage()); log.debug("Exception", e); } return null; diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/LoggedUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/LoggedUtils.java index 2beb43c..1f8c4e0 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/LoggedUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/LoggedUtils.java @@ -1,6 +1,5 @@ package org.ovirt.engine.core.utils.log; -import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.utils.log.Logged.LogLevel; import org.slf4j.Logger; @@ -125,7 +124,7 @@ Logged logged = getAnnotation(obj); if (logged != null && isLogLevelOn(log, logged.errorLevel())) { log(log, logged.errorLevel(), ERROR_LOG, determineMessage(log, logged, obj), - ExceptionUtils.getMessage(t), id); + t.getMessage(), id); log.error("Exception", t); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index 2a986be..5771ea2 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -17,7 +17,6 @@ import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.FeatureSupported; import org.ovirt.engine.core.common.businessentities.CpuStatistics; @@ -575,9 +574,9 @@ private void logFailureMessage(String messagePrefix, RuntimeException ex) { log.error("{} vds={}({}): {}", messagePrefix, - ExceptionUtils.getMessage(ex), _vds.getName(), - _vds.getId()); + _vds.getId(), + ex.getMessage()); } protected IVdsEventListener getVdsEventListener() { -- To view, visit http://gerrit.ovirt.org/34668 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I113d01c167397456c0cc7b12a112971e482cf56d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
