Liron Ar has uploaded a new change for review. Change subject: core: fix audit logging when removing template from export ......................................................................
core: fix audit logging when removing template from export 1. When removing a template without disks, audit log was never printed. 2. There was no attempt to print audit log following previous change. Change-Id: I09093f9d5f83314262493ea8bcbe37beb8732661 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java 1 file changed, 10 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/14041/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java index e6fa0f1..b0c083b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java @@ -101,6 +101,7 @@ Backend.getInstance().getResourceManager().RunVdsCommand(VDSCommandType.RemoveVM, tempVar); List<DiskImage> images = getParameters().getImages(); + setSucceeded(true); if (!images.isEmpty()) { for (DiskImage image : images) { ArrayList<Guid> storageIds = new ArrayList<Guid>(); @@ -119,34 +120,31 @@ ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); if (vdcRetValue.getSucceeded()) { getReturnValue().getTaskIdList().addAll(vdcRetValue.getInternalTaskIdList()); - setSucceeded(true); } else { getReturnValue().setFault(vdcRetValue.getFault()); + setSucceeded(false); } } - - setCommandShouldBeLogged(false); - setSucceeded(true); } @Override public AuditLogType getAuditLogTypeValue() { - switch (getActionState()) { - case EXECUTE: - return getSucceeded() ? AuditLogType.IMPORTEXPORT_REMOVE_TEMPLATE - : AuditLogType.IMPORTEXPORT_REMOVE_TEMPLATE_FAILED; - default: - return AuditLogType.UNASSIGNED; - } + return getSucceeded() ? AuditLogType.IMPORTEXPORT_REMOVE_TEMPLATE + : AuditLogType.IMPORTEXPORT_REMOVE_TEMPLATE_FAILED; } @Override protected void endSuccessfully() { - setSucceeded(true); + endRemoveTemplate(); } @Override protected void endWithFailure() { + endRemoveTemplate(); + } + + protected void endRemoveTemplate() { + setCommandShouldBeLogged(false); setSucceeded(true); } -- To view, visit http://gerrit.ovirt.org/14041 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09093f9d5f83314262493ea8bcbe37beb8732661 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Ar <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
