Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

improvements to purge job

Browse Source
This commit is contained in:
Shaun Walker
2022-01-08 10:17:10 -05:00
parent 07718f0449
commit eaf840e1da
2 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
View File

@ -124,6 +124,10 @@
_osversion = systeminfo["osversion"]; _osversion = systeminfo["osversion"];
_serverpath = systeminfo["serverpath"]; _serverpath = systeminfo["serverpath"];
_servertime = systeminfo["servertime"]; _servertime = systeminfo["servertime"];
if (DateTime.TryParse(_servertime, out DateTime date))
{
_servertime += " (" + date.ToUniversalTime().ToString() + " UTC)";
}
_installationid = systeminfo["installationid"]; _installationid = systeminfo["installationid"];
_detailederrors = systeminfo["detailederrors"]; _detailederrors = systeminfo["detailederrors"];

21
Oqtane.Server/Infrastructure/Jobs/PurgeJob.cs
View File

@ -42,23 +42,26 @@ namespace Oqtane.Infrastructure
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 logretention = 30; int retention = 30; // 30 days
if (settings.ContainsKey("LogRetention") && settings["LogRetention"] != "") if (settings.ContainsKey("LogRetention") && !string.IsNullOrEmpty(settings["LogRetention"]))
{ {
logretention = int.Parse(settings["LogRetention"]); retention = int.Parse(settings["LogRetention"]);
} }
int count = logRepository.DeleteLogs(logretention); int count = logRepository.DeleteLogs(retention);
log += count.ToString() + " Event Logs Purged<br />"; log += count.ToString() + " Events Purged<br />";
// purge visitors // purge visitors
int visitorrention = 30; if (site.VisitorTracking)
if (settings.ContainsKey("VisitorRetention") && settings["VisitorRetention"] != "")
{ {
visitorrention = int.Parse(settings["VisitorRetention"]); retention = 30; // 30 days
if (settings.ContainsKey("VisitorRetention") && !string.IsNullOrEmpty(settings["VisitorRetention"]))
{
retention = int.Parse(settings["VisitorRetention"]);
} }
count = visitorRepository.DeleteVisitors(visitorrention); count = visitorRepository.DeleteVisitors(retention);
log += count.ToString() + " Visitors Purged<br />"; log += count.ToString() + " Visitors Purged<br />";
} }
}
return log; return log;
} }