Asaf Shakarchi has uploaded a new change for review. Change subject: engine: Fixed a spelling mistake in AuditLogAgingThreashold config var ......................................................................
engine: Fixed a spelling mistake in AuditLogAgingThreashold config var Fixed a spelling mistake in 'AuditLogAgingThreashold' config variable, Changed to 'AuditLogAgingThreshold' Change-Id: I14becc0f57404a86ca18917e4b6e2d00054a44b1 Bug-Url: https://bugzilla.redhat.com/743032 Signed-off-by: Asaf Shakarchi <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AuditLogCleanupManager.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/tools/engine-config/src/main/resources/engine-config.properties 4 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/10970/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index e398c89..f693e84 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -44,7 +44,7 @@ select fn_db_add_config_value('AsyncTaskStatusCacheRefreshRateInSeconds','30','general'); select fn_db_add_config_value('AsyncTaskStatusCachingTimeInMinutes','1','general'); select fn_db_add_config_value('AsyncTaskZombieTaskLifeInMinutes','300','general'); -select fn_db_add_config_value('AuditLogAgingThreashold','30','general'); +select fn_db_add_config_value('AuditLogAgingThreshold','30','general'); select fn_db_add_config_value('AuditLogCleanupTime','03:35:35','general'); select fn_db_add_config_value('OnlyRequiredNetworksMandatoryForVdsSelection','false','general'); --Handling Authentication Method @@ -638,6 +638,7 @@ select fn_db_delete_config_value('UseRtl8139_pv','2.2,3.0,3.1,3.2'); select fn_db_delete_config_value('VdsFenceOptions','general'); select fn_db_delete_config_value('VirtualMachineDomainName','general'); +select fn_db_delete_config_value('AuditLogAgingThreashold','general'); ------------------------------------------------------------------------------------ -- Split config section -- The purpose of this section is to treat config option that was once diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AuditLogCleanupManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AuditLogCleanupManager.java index 05afbbc..007c8cc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AuditLogCleanupManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AuditLogCleanupManager.java @@ -40,7 +40,8 @@ try { log.info("AuditLogCleanupManager::deleteAgedOutAuditLogs - entered"); DateTime latestTimeToKeep = DateTime.getNow().AddDays( - Config.<Integer> GetValue(ConfigValues.AuditLogAgingThreashold) * -1); + Config.<Integer> GetValue(ConfigValues.AuditLogAgingThreshold) + * -1); DbFacade.getInstance().getAuditLogDao().removeAllBeforeDate(latestTimeToKeep); } catch (RuntimeException e) { log.error("AuditLogCleanupManager::deleteAgedOutAuditLogs() - failed with exception", e); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 942ec43..ebc3f80 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -64,7 +64,7 @@ @Reloadable @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("30") - AuditLogAgingThreashold(20), + AuditLogAgingThreshold(20), @Reloadable @TypeConverterAttribute(String.class) @DefaultValueAttribute("drac5,ilo,ipmilan,rsa,bladecenter,alom,apc,eps,wti,rsb") diff --git a/backend/manager/tools/engine-config/src/main/resources/engine-config.properties b/backend/manager/tools/engine-config/src/main/resources/engine-config.properties index d481fa4..43dd3e0 100644 --- a/backend/manager/tools/engine-config/src/main/resources/engine-config.properties +++ b/backend/manager/tools/engine-config/src/main/resources/engine-config.properties @@ -7,8 +7,8 @@ AsyncTaskPollingRate.type=Integer AsyncTaskZombieTaskLifeInMinutes.description="Zombie tasks life-time in minutes" AsyncTaskZombieTaskLifeInMinutes.type=Integer -AuditLogAgingThreashold.description="Audit Log Aging Threshold (in days)" -AuditLogAgingThreashold.type=Integer +AuditLogAgingThreshold.description="Audit Log Aging Threshold (in days)" +AuditLogAgingThreshold.type=Integer AuditLogCleanupTime.description="Audit Log Cleanup Time" AuthenticationMethod.description="Authentication Method" AuthenticationMethod.validValues=LDAP,Windows -- To view, visit http://gerrit.ovirt.org/10970 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14becc0f57404a86ca18917e4b6e2d00054a44b1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Asaf Shakarchi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
