Liron Ar has uploaded a new change for review. Change subject: core: wip: add internal failed CDA messages to audit log ......................................................................
core: wip: add internal failed CDA messages to audit log Change-Id: Ib6b73000911ab8e20276ab8b45f98c311115dcaa Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java 3 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/24066/1 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 58f405b..c36f7a7 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 @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -2107,4 +2108,17 @@ } super.setCorrelationId(correlationId); } + + + public void addInternalErrors(List<String> messages) { + if (messages == null || messages.isEmpty()) { + return; + } + + if (getInternalErrors() == null) { + setInternalErrors(new LinkedList<String>()); + } + + getInternalErrors().addAll(getBackend().getErrorsTranslator().TranslateErrorText(messages)); + } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java index fca7342..6fb733f 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java @@ -29,6 +29,7 @@ new EnumMap<AuditLogType, AuditLogSeverity>(AuditLogType.class); private static final Pattern pattern = Pattern.compile("\\$\\{\\w*\\}"); // match ${<alphanumeric>...} static final String UNKNOWN_VARIABLE_VALUE = "Non interactive user"; + static final String INTERNAL_ERRORS_SEPERATOR = " Failed due to the following errors(s): "; private static final String APP_ERRORS_MESSAGES_FILE_NAME = "bundles/AuditLogMessages"; static { @@ -974,6 +975,9 @@ auditLogable.getCustomData()); } else if ((message = messages.get(logType)) != null) { // Application log message from AuditLogMessages resolvedMessage = resolveMessage(message, auditLogable); + if (auditLogable.getInternalErrors() != null && !auditLogable.getInternalErrors().isEmpty()) { + resolvedMessage = resolvedMessage + INTERNAL_ERRORS_SEPERATOR + StringUtils.join(auditLogable.getInternalErrors(), ", "); + } auditLog = new AuditLog(logType, severity, resolvedMessage, auditLogable.getUserId(), auditLogable.getUserName(), auditLogable.getVmIdRef(), auditLogable.getVmName(), auditLogable.getVdsIdRef(), auditLogable.getVdsName(), auditLogable.getVmTemplateIdRef(), diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java index 4c54157..8b0176d 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java @@ -87,6 +87,7 @@ private Guid quotaIdForLog; private String quotaNameForLog; private String callStack; + private List<String> internalErrors; public AuditLogableBase() { } @@ -750,6 +751,14 @@ this.callStack = callStack; } + public List<String> getInternalErrors() { + return internalErrors; + } + + public void setInternalErrors(List<String> internalErrors) { + this.internalErrors = internalErrors; + } + /** * Sets the call stack string from a Throwable object * Also, the updateCallStackFromThrowable can be used in case you have a Throwable object with the call stack details -- To view, visit http://gerrit.ovirt.org/24066 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6b73000911ab8e20276ab8b45f98c311115dcaa 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
