Merge pull request #1916 from sbwalker/dev

add error handling in purge job
This commit is contained in:
Shaun Walker 2022-01-08 10:12:27 -05:00 committed by GitHub
commit aa22db7fe5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -37,18 +37,27 @@ namespace Oqtane.Infrastructure
foreach (Site site in sites) foreach (Site site in sites)
{ {
log += "Processing Site: " + site.Name + "<br />"; log += "Processing Site: " + site.Name + "<br />";
int retention;
int count;
// get site settings // get site settings
Dictionary<string, string> settings = GetSettings(settingRepository.GetSettings(EntityNames.Site, site.SiteId).ToList()); Dictionary<string, string> settings = GetSettings(settingRepository.GetSettings(EntityNames.Site, site.SiteId).ToList());
// purge event log // purge event log
int retention = 30; // 30 days retention = 30; // 30 days
if (settings.ContainsKey("LogRetention") && !string.IsNullOrEmpty(settings["LogRetention"])) if (settings.ContainsKey("LogRetention") && !string.IsNullOrEmpty(settings["LogRetention"]))
{ {
retention = int.Parse(settings["LogRetention"]); retention = int.Parse(settings["LogRetention"]);
} }
int count = logRepository.DeleteLogs(retention); try
log += count.ToString() + " Events Purged<br />"; {
count = logRepository.DeleteLogs(retention);
log += count.ToString() + " Events Purged<br />";
}
catch (Exception ex)
{
log += $"Error Purging Events - {ex.Message}<br />";
}
// purge visitors // purge visitors
if (site.VisitorTracking) if (site.VisitorTracking)
@ -58,8 +67,15 @@ namespace Oqtane.Infrastructure
{ {
retention = int.Parse(settings["VisitorRetention"]); retention = int.Parse(settings["VisitorRetention"]);
} }
count = visitorRepository.DeleteVisitors(retention); try
log += count.ToString() + " Visitors Purged<br />"; {
count = visitorRepository.DeleteVisitors(retention);
log += count.ToString() + " Visitors Purged<br />";
}
catch (Exception ex)
{
log += $"Error Purging Visitors - {ex.Message}<br />";
}
} }
} }