Federico Simoncelli has uploaded a new change for review. Change subject: core: generalize image list messages ......................................................................
core: generalize image list messages Change-Id: I3f028188993624aed6bff6179d406f0be03f3e1e Signed-off-by: Federico Simoncelli <fsimo...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.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/resources/bundles/AuditLogMessages.properties 4 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/17732/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java index ded6d6b..5c4ba97 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java @@ -717,7 +717,7 @@ // Get translated error by error code ,if no translation found (should not happened) , // will set the error code instead. logable.addCustomValue("isoDomains", problematicRepoFilesList); - AuditLogDirector.log(logable, AuditLogType.REFRESH_REPOSITORY_FILE_LIST_FAILED); + AuditLogDirector.log(logable, AuditLogType.REFRESH_REPOSITORY_IMAGE_LIST_FAILED); } /** @@ -726,7 +726,7 @@ private static void addToAuditLogSuccessMessage(String IsoDomain, String imageType) { AuditLogableBase logable = new AuditLogableBase(); logable.addCustomValue("isoDomains", String.format("%s (%s file type)", IsoDomain, imageType)); - AuditLogDirector.log(logable, AuditLogType.REFRESH_REPOSITORY_FILE_LIST_SUCCEEDED); + AuditLogDirector.log(logable, AuditLogType.REFRESH_REPOSITORY_IMAGE_LIST_SUCCEEDED); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java index 42cd84d..c497a79 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java @@ -681,8 +681,8 @@ CONNECT_STORAGE_SERVERS_FAILED(994), CONNECT_STORAGE_POOL_FAILED(995), STORAGE_DOMAIN_ERROR(996), - REFRESH_REPOSITORY_FILE_LIST_FAILED(997), - REFRESH_REPOSITORY_FILE_LIST_SUCCEEDED(998), + REFRESH_REPOSITORY_IMAGE_LIST_FAILED(997), + REFRESH_REPOSITORY_IMAGE_LIST_SUCCEEDED(998), STORAGE_ALERT_VG_METADATA_CRITICALLY_FULL(999, AuditLogTimeInterval.MINUTE.getValue() * 15), STORAGE_ALERT_SMALL_VG_METADATA(1000, AuditLogTimeInterval.HOUR.getValue() * 12), USER_ATTACH_STORAGE_DOMAINS_TO_POOL(1002), 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 66cc04c..44acde6 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 @@ -431,7 +431,7 @@ severities.put(AuditLogType.IRS_FAILURE, AuditLogSeverity.ERROR); severities.put(AuditLogType.IRS_DISK_SPACE_LOW_ERROR, AuditLogSeverity.ERROR); severities.put(AuditLogType.IRS_DISK_SPACE_LOW, AuditLogSeverity.WARNING); - severities.put(AuditLogType.REFRESH_REPOSITORY_FILE_LIST_SUCCEEDED, AuditLogSeverity.NORMAL); + severities.put(AuditLogType.REFRESH_REPOSITORY_IMAGE_LIST_SUCCEEDED, AuditLogSeverity.NORMAL); severities.put(AuditLogType.SYSTEM_DEACTIVATED_STORAGE_DOMAIN, AuditLogSeverity.WARNING); severities.put(AuditLogType.SYSTEM_CHANGE_STORAGE_POOL_STATUS_PROBLEMATIC_FROM_NON_OPERATIONAL, AuditLogSeverity.NORMAL); @@ -439,7 +439,7 @@ severities.put(AuditLogType.CONNECT_STORAGE_SERVERS_FAILED, AuditLogSeverity.WARNING); severities.put(AuditLogType.CONNECT_STORAGE_POOL_FAILED, AuditLogSeverity.WARNING); severities.put(AuditLogType.STORAGE_DOMAIN_ERROR, AuditLogSeverity.ERROR); - severities.put(AuditLogType.REFRESH_REPOSITORY_FILE_LIST_FAILED, AuditLogSeverity.ERROR); + severities.put(AuditLogType.REFRESH_REPOSITORY_IMAGE_LIST_FAILED, AuditLogSeverity.ERROR); severities.put(AuditLogType.STORAGE_ALERT_VG_METADATA_CRITICALLY_FULL, AuditLogSeverity.ERROR); severities.put(AuditLogType.STORAGE_ALERT_SMALL_VG_METADATA, AuditLogSeverity.WARNING); severities.put(AuditLogType.STORAGE_ACTIVATE_ASYNC, AuditLogSeverity.NORMAL); diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index ad4e5f5..e6905eb 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -550,8 +550,8 @@ VDS_ALERT_FENCE_STATUS_VERIFICATION_FAILED=Failed to verify Host ${Host} ${Status} status, Please ${Status} Host ${Host} manually. VDS_ALERT_SECONDARY_AGENT_USED_FOR_FENCE_OPERATION=Secondary fence agent was used to ${Operation} Host ${VdsName} TASK_STOPPING_ASYNC_TASK=Stopping async task ${CommandName} that started at ${Date} -REFRESH_REPOSITORY_FILE_LIST_FAILED=Failed to refresh the following Iso domains :${isoDomains}. Please check domain activity. -REFRESH_REPOSITORY_FILE_LIST_SUCCEEDED=Succeeded to refresh Iso domain : ${isoDomains} +REFRESH_REPOSITORY_IMAGE_LIST_FAILED=Refresh image list failed for domains: ${isoDomains}. Please check domain activity. +REFRESH_REPOSITORY_IMAGE_LIST_SUCCEEDED=Refresh image list succeeded for domains: ${isoDomains} TASK_CLEARING_ASYNC_TASK=Clearing asynchronous task ${CommandName} that started at ${Date} VM_WAS_SET_DOWN_DUE_TO_HOST_REBOOT_OR_MANUAL_FENCE=Vm ${VmName} was shut down due to ${VdsName} host reboot or manual fence UPDATE_TAGS_VM_DEFAULT_DISPLAY_TYPE=Vm ${VmName} tag default display type was updated -- To view, visit http://gerrit.ovirt.org/17732 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f028188993624aed6bff6179d406f0be03f3e1e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches