admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-12-24 22:57:45 +00:00
parent e703b440b2
commit 71fa9e5ef5
47 changed files with 145 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/generator/CoreJobBackup.cs
View File

@@ -29,7 +29,7 @@ namespace AyaNova.Biz
if (BackupIsRunning) return;
if (!OnDemand)
{
log.LogTrace("Checking if backup should run");
log.LogDebug("Checking if backup should run");
if (!ServerGlobalOpsSettingsCache.Backup.Active)
{
log.LogDebug("Automatic backup is set to INACTIVE - not backing up");
@@ -38,7 +38,7 @@ namespace AyaNova.Biz
if (DateTime.UtcNow < ServerGlobalOpsSettingsCache.NextBackup)
{
log.LogTrace("Not past backup time yet");
log.LogDebug("Not past backup time yet");
return;
}
}

6
server/AyaNova/generator/CoreJobLicense.cs
View File

@@ -33,7 +33,7 @@ namespace AyaNova.Biz
//
public static async Task DoWorkAsync()
{
log.LogTrace("Job starting");
log.LogDebug("Job starting");
var tsSinceLastCheck = DateTime.UtcNow - _lastCheck;
//which track are we on?
/*
@@ -56,10 +56,10 @@ namespace AyaNova.Biz
tsCheckFrequency = SLOW_TRACK;
break;
}
log.LogTrace($"Check frequency{tsCheckFrequency}");
log.LogDebug($"Check frequency{tsCheckFrequency}");
if (tsSinceLastCheck < tsCheckFrequency)
{
log.LogTrace($"Not yet");
log.LogDebug($"Not yet");
return;
}

4
server/AyaNova/generator/CoreJobMetricsSnapshot.cs
View File

@@ -44,7 +44,7 @@ namespace AyaNova.Biz
/////////////////////////////////////////////
//ONE MINUTE SNAPS
//
log.LogTrace("MM metrics snapshot");
log.LogDebug("MM metrics snapshot");
var now = DateTime.UtcNow;
_process.Refresh();
@@ -97,7 +97,7 @@ namespace AyaNova.Biz
//
if (DateUtil.IsAfterDuration(_lastDDSnapshot, ts24Hours))
{
log.LogTrace("DD metrics snapshot");
log.LogDebug("DD metrics snapshot");
var now = DateTime.UtcNow;
//FILES ON DISK
var UtilFilesInfo = FileUtil.GetBackupFolderSizeInfo();

24
server/AyaNova/generator/CoreJobNotify.cs
View File

@@ -34,22 +34,22 @@ namespace AyaNova.Biz
//
public static async Task DoWorkAsync()
{
log.LogTrace("Checking if Notify should run");
log.LogDebug("Checking if Notify should run");
if (NotifyIsRunning)
{
log.LogTrace("Notify is running already exiting this cycle");
log.LogDebug("Notify is running already exiting this cycle");
return;
}
//This will get triggered roughly every minute, but we don't want to deliver that frequently
if (DateTime.UtcNow - lastRun < RUN_EVERY_INTERVAL)
{
log.LogTrace($"Notify ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
log.LogDebug($"Notify ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
return;
}
try
{
NotifyIsRunning = true;
log.LogTrace("Notify set to RUNNING state and starting now");
log.LogDebug("Notify set to RUNNING state and starting now");
//NotifyHealthCheck processing
//Note this deliberately uses LOCAL time in effort to deliver the health check first thing in the morning for workers
@@ -60,7 +60,7 @@ namespace AyaNova.Biz
//are we in the 7th to 9th hour?
if (dtNowLocal.Hour > 6 && dtNowLocal.Hour < 10)
{
log.LogTrace("Notify health check submitted to subscribers");
log.LogDebug("Notify health check submitted to subscribers");
await NotifyEventHelper.AddGeneralNotifyEvent(NotifyEventType.NotifyHealthCheck, "OK", "");
lastNotifyHealthCheckSentLocal = dtNowLocal;
}
@@ -69,7 +69,7 @@ namespace AyaNova.Biz
using (AyContext ct = AyaNova.Util.ServiceProviderProvider.DBContext)
{
var events = await ct.NotifyEvent.AsNoTracking().ToListAsync();
log.LogTrace($"Found {events.Count} NotifyEvents to examine for potential delivery");
log.LogDebug($"Found {events.Count} NotifyEvents to examine for potential delivery");
//iterate and deliver
foreach (var notifyevent in events)
@@ -78,7 +78,7 @@ namespace AyaNova.Biz
var UserInfo = await ct.User.AsNoTracking().Where(x => x.Id == notifyevent.UserId).Select(x => new { Active = x.Active, Name = x.Name }).FirstOrDefaultAsync();
if (!UserInfo.Active)
{
log.LogTrace($"Inactive user {UserInfo.Name}, removing notify rather than delivering it: {notifyevent}");
log.LogDebug($"Inactive user {UserInfo.Name}, removing notify rather than delivering it: {notifyevent}");
ct.NotifyEvent.Remove(notifyevent);
await ct.SaveChangesAsync();
continue;
@@ -115,7 +115,7 @@ namespace AyaNova.Biz
//look for same delivery less than last12hours ago
if (await ct.NotifyDeliveryLog.AnyAsync(z => z.Processed > twelvehoursago && z.NotifySubscriptionId == notifyevent.NotifySubscriptionId && z.ObjectId == notifyevent.ObjectId))
{
log.LogTrace($"Notification event will not be delivered: repetitive (server system event type and delivered at least once in the last 12 hours to this subscriber: {notifyevent})");
log.LogDebug($"Notification event will not be delivered: repetitive (server system event type and delivered at least once in the last 12 hours to this subscriber: {notifyevent})");
ct.NotifyEvent.Remove(notifyevent);
await ct.SaveChangesAsync();
#if (DEBUG)
@@ -142,7 +142,7 @@ namespace AyaNova.Biz
}
finally
{
log.LogTrace("Notify is done setting to not running state and tagging lastRun timestamp");
log.LogDebug("Notify is done setting to not running state and tagging lastRun timestamp");
lastRun = DateTime.UtcNow;
NotifyIsRunning = false;
@@ -152,7 +152,7 @@ namespace AyaNova.Biz
private static async Task DeliverInApp(NotifyEvent ne, TimeSpan ageValue, AyContext ct)
{
log.LogTrace($"DeliverInApp notify event: {ne}");
log.LogDebug($"DeliverInApp notify event: {ne}");
//Place in the In-app notification table for user to view
await ct.InAppNotification.AddAsync(
@@ -195,7 +195,7 @@ namespace AyaNova.Biz
try
{
log.LogTrace($"DeliverSMTP delivering notify event: {ne}");
log.LogDebug($"DeliverSMTP delivering notify event: {ne}");
if (string.IsNullOrWhiteSpace(deliveryAddress))
{
await NotifyEventHelper.AddGeneralNotifyEvent(NotifyEventType.GeneralNotification, $"No email address is set in subscription to deliver email notification. This event will be removed from the delivery queue as undeliverable: {ne}", "Error", null, ne.UserId);
@@ -314,7 +314,7 @@ namespace AyaNova.Biz
await NotifyEventHelper.AddGeneralNotifyEvent(NotifyEventType.GeneralNotification, $"An error prevented delivering the following notification via email. System operator users have been notified:{ne}", "Error", null, ne.UserId);
DeliveryLogItem.Fail = true;
DeliveryLogItem.Error = $"SMTP Notification failed to deliver for this event: {ne}, message: {ex.Message}";
log.LogTrace(ex, $"DeliverSMTP Failure delivering notify event: {ne}");
log.LogDebug(ex, $"DeliverSMTP Failure delivering notify event: {ne}");
}
finally
{

10
server/AyaNova/generator/CoreJobPMGenerate.cs
View File

@@ -31,22 +31,22 @@ namespace AyaNova.Biz
public static async Task DoWorkAsync()
{
log.LogTrace("Checking if PMGenerate should run");
log.LogDebug("Checking if PMGenerate should run");
if (IsRunning)
{
log.LogTrace("PMGenerate is running already exiting this cycle");
log.LogDebug("PMGenerate is running already exiting this cycle");
return;
}
//This will get triggered roughly every minute, but we don't want to deliver that frequently
if (DateTime.UtcNow - lastRun < RUN_EVERY_INTERVAL)
{
log.LogTrace($"PMGenerate ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
log.LogDebug($"PMGenerate ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
return;
}
try
{
IsRunning = true;
log.LogTrace("PMGenerate set to RUNNING state and starting now");
log.LogDebug("PMGenerate set to RUNNING state and starting now");
using (AyContext ct = AyaNova.Util.ServiceProviderProvider.DBContext)
{
@@ -60,7 +60,7 @@ namespace AyaNova.Biz
}
finally
{
log.LogTrace("PMGenerate has completed; setting to not running state and tagging lastRun timestamp");
log.LogDebug("PMGenerate has completed; setting to not running state and tagging lastRun timestamp");
lastRun = DateTime.UtcNow;
IsRunning = false;

10
server/AyaNova/generator/CoreJobPMInventoryCheck.cs
View File

@@ -31,16 +31,16 @@ namespace AyaNova.Biz
public static async Task DoWorkAsync()
{
log.LogTrace("Checking if CoreJobPMInventoryCheck should run");
log.LogDebug("Checking if CoreJobPMInventoryCheck should run");
if (IsRunning)
{
log.LogTrace("CoreJobPMInventoryCheck is running already exiting this cycle");
log.LogDebug("CoreJobPMInventoryCheck is running already exiting this cycle");
return;
}
//This will get triggered roughly every minute, but we don't want to deliver that frequently
if (DateTime.UtcNow - lastRun < RUN_EVERY_INTERVAL)
{
log.LogTrace($"CoreJobPMInventoryCheck ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
log.LogDebug($"CoreJobPMInventoryCheck ran less than {RUN_EVERY_INTERVAL} ago, exiting this cycle");
return;
}
@@ -48,7 +48,7 @@ namespace AyaNova.Biz
try
{
IsRunning = true;
log.LogTrace("CoreJobPMInventoryCheck set to RUNNING state and starting now");
log.LogDebug("CoreJobPMInventoryCheck set to RUNNING state and starting now");
using (AyContext ct = AyaNova.Util.ServiceProviderProvider.DBContext)
{
@@ -62,7 +62,7 @@ namespace AyaNova.Biz
}
finally
{
log.LogTrace("CoreJobPMInventoryCheck has completed; setting to not running state and tagging lastRun timestamp");
log.LogDebug("CoreJobPMInventoryCheck has completed; setting to not running state and tagging lastRun timestamp");
lastRun = DateTime.UtcNow;
IsRunning = false;
}

2
server/AyaNova/generator/CoreJobReportRenderEngineProcessCleanup.cs
View File

@@ -23,7 +23,7 @@ namespace AyaNova.Biz
{
if (DateUtil.IsAfterDuration(_lastRun, tsRunEvery))
{
log.LogTrace("Checking for expired processes");
log.LogDebug("Checking for expired processes");
Util.ReportRenderManager.KillExpiredRenders(log);
//FileUtil.CleanTemporaryFilesFolder(new TimeSpan(0,5,0));//erase any files found to be older than 5 minutes
var now = DateTime.UtcNow;

8
server/AyaNova/generator/CoreJobSweeper.cs
View File

@@ -33,7 +33,7 @@ namespace AyaNova.Biz
if (DateTime.UtcNow - lastSweep < SWEEP_EVERY_INTERVAL)
return;
log.LogTrace("Sweep starting");
log.LogDebug("Sweep starting");
using (AyContext ct = AyaNova.Util.ServiceProviderProvider.DBContext)
{
//SWEEP SUCCESSFUL JOBS
@@ -82,7 +82,7 @@ namespace AyaNova.Biz
.OrderBy(z => z.Created)
.ToListAsync();
log.LogTrace($"SweepAsync processing: cutoff={dtDeleteCutoff.ToString()}, for {jobs.Count.ToString()} jobs of status {jobStatus.ToString()}");
log.LogDebug($"SweepAsync processing: cutoff={dtDeleteCutoff.ToString()}, for {jobs.Count.ToString()} jobs of status {jobStatus.ToString()}");
foreach (OpsJob j in jobs)
{
@@ -113,7 +113,7 @@ namespace AyaNova.Biz
.OrderBy(z => z.Created)
.ToListAsync();
log.LogTrace($"killStuckJobsAsync processing: cutoff={dtRunningDeadline.ToString()}, for {jobs.Count.ToString()} jobs of status {JobStatus.Running.ToString()}");
log.LogDebug($"killStuckJobsAsync processing: cutoff={dtRunningDeadline.ToString()}, for {jobs.Count.ToString()} jobs of status {JobStatus.Running.ToString()}");
foreach (OpsJob j in jobs)
{
@@ -134,7 +134,7 @@ namespace AyaNova.Biz
.OrderBy(z => z.Created)
.ToListAsync();
log.LogTrace($"SweepInternalJobsLogsAsync processing: cutoff={dtDeleteCutoff.ToString()}, for {logs.Count.ToString()} log entries");
log.LogDebug($"SweepInternalJobsLogsAsync processing: cutoff={dtDeleteCutoff.ToString()}, for {logs.Count.ToString()} log entries");
foreach (OpsJobLog l in logs)
{

2
server/AyaNova/generator/CoreJobTempFolderCleanup.cs
View File

@@ -22,7 +22,7 @@ namespace AyaNova.Biz
{
if (DateUtil.IsAfterDuration(_lastRun, tsRunEvery))
{
log.LogTrace("Temp cleanup now");
log.LogDebug("Temp cleanup now");
FileUtil.CleanTemporaryFilesFolder(new TimeSpan(0,15,0));//erase any files found to be older than 15 minutes (which coincides with max report rendering timeout)
var now = DateTime.UtcNow;
_lastRun = now;

2
server/AyaNova/generator/CoreNotificationSweeper.cs
View File

@@ -28,7 +28,7 @@ namespace AyaNova.Biz
DateTime dtDeleteCutoff = DateTime.UtcNow - DELETE_AFTER_AGE;
DateTime dtPastEventCutoff = DateTime.UtcNow - SWEEP_EVERY_INTERVAL;
log.LogTrace("Sweep starting");
log.LogDebug("Sweep starting");
using (AyContext ct = AyaNova.Util.ServiceProviderProvider.DBContext)
{
//Notification (in-App notifications table) - deletes all APP notifications older than 90 days (if they want to keep it then can turn it into a reminder or SAVE it somehow)

2
server/AyaNova/generator/Generate.cs
View File

@@ -48,7 +48,7 @@ namespace AyaNova.Generator
{
if (!ServerGlobalOpsSettingsCache.BOOTING)
{
log.LogTrace($"GeneratorService running jobs");
log.LogDebug($"GeneratorService running jobs");
//=================================================================
try