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

Merge pull request #1915 from sbwalker/dev

Browse Source 
improvements to purge job
This commit is contained in:
Shaun Walker
2022-01-08 10:07:36 -05:00
committed by GitHub
parent 6759156519 eaf840e1da
commit 35edf78aed
2 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,32 +99,36 @@
</TabStrip> </TabStrip>
@code { @code {
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
private string _version = string.Empty; private string _version = string.Empty;
private string _clrversion = string.Empty; private string _clrversion = string.Empty;
private string _osversion = string.Empty; private string _osversion = string.Empty;
private string _serverpath = string.Empty; private string _serverpath = string.Empty;
private string _servertime = string.Empty; private string _servertime = string.Empty;
private string _installationid = string.Empty; private string _installationid = string.Empty;
private string _detailederrors = string.Empty; private string _detailederrors = string.Empty;
private string _logginglevel = string.Empty; private string _logginglevel = string.Empty;
private string _swagger = string.Empty; private string _swagger = string.Empty;
private string _packageservice = string.Empty; private string _packageservice = string.Empty;
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
_version = Constants.Version; _version = Constants.Version;
Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync(); Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
if (systeminfo != null) if (systeminfo != null)
{ {
_clrversion = systeminfo["clrversion"]; _clrversion = systeminfo["clrversion"];
_osversion = systeminfo["osversion"]; _osversion = systeminfo["osversion"];
_serverpath = systeminfo["serverpath"]; _serverpath = systeminfo["serverpath"];
_servertime = systeminfo["servertime"]; _servertime = systeminfo["servertime"];
_installationid = systeminfo["installationid"]; if (DateTime.TryParse(_servertime, out DateTime date))
{
_servertime += " (" + date.ToUniversalTime().ToString() + " UTC)";
}
_installationid = systeminfo["installationid"];
_detailederrors = systeminfo["detailederrors"]; _detailederrors = systeminfo["detailederrors"];
_logginglevel = systeminfo["logginglevel"]; _logginglevel = systeminfo["logginglevel"];

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

@ -42,22 +42,25 @@ 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(retention);
log += count.ToString() + " Visitors Purged<br />";
} }
count = visitorRepository.DeleteVisitors(visitorrention);
log += count.ToString() + " Visitors Purged<br />";
} }
return log; return log;