server/AyaNova/generator/CoreNotificationSweeper.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -8,7 +7,6 @@ using AyaNova.Models;
 namespace AyaNova.Biz
 {
 
-
     /// <summary>
     /// Clean up notification system, keep items down to 90 days
     /// 
@@ -52,82 +50,6 @@ namespace AyaNova.Biz
         }
 
 
-        private static async Task sweepAsync(AyContext ct, DateTime dtDeleteCutoff, JobStatus jobStatus)
-        {
-            //Get the deleteable succeeded jobs list
-            var jobs = await ct.OpsJob
-                   .AsNoTracking()
-                   .Where(z => z.Created < dtDeleteCutoff && z.JobStatus == jobStatus)
-                   .OrderBy(z => z.Created)
-                   .ToListAsync();
-
-            log.LogTrace($"SweepAsync processing: cutoff={dtDeleteCutoff.ToString()}, for {jobs.Count.ToString()} jobs of status {jobStatus.ToString()}");
-
-            foreach (OpsJob j in jobs)
-            {
-                try
-                {
-
-                    await JobsBiz.RemoveJobAndLogsAsync(j.GId);
-                }
-                catch (Exception ex)
-                {
-                    log.LogError(ex, "sweepAsync exception calling JobsBiz.RemoveJobAndLogsAsync");
-                    //for now just throw it but this needs to be removed when logging added and better handling 
-                    throw (ex);
-                }
-            }
-        }
-
-
-        /// <summary>
-        /// Kill jobs that have been stuck in "running" state for too long
-        /// </summary>        
-        private static async Task killStuckJobsAsync(AyContext ct, DateTime dtRunningDeadline)
-        {
-            //Get the deleteable succeeded jobs list
-            var jobs = await ct.OpsJob
-                   .AsNoTracking()
-                   .Where(z => z.Created < dtRunningDeadline && z.JobStatus == JobStatus.Running)
-                   .OrderBy(z => z.Created)
-                   .ToListAsync();
-
-            log.LogTrace($"killStuckJobsAsync processing: cutoff={dtRunningDeadline.ToString()}, for {jobs.Count.ToString()} jobs of status {JobStatus.Running.ToString()}");
-
-            foreach (OpsJob j in jobs)
-            {
-                //OPSMETRIC
-                await JobsBiz.LogJobAsync(j.GId, "Job took too long to run - setting to failed");
-                log.LogError($"Job found job stuck in running status and set to failed: deadline={dtRunningDeadline.ToString()}, jobId={j.GId.ToString()}, jobname={j.Name}, jobtype={j.JobType.ToString()}, jobObjectType={j.ObjectType.ToString()}, jobObjectId={j.ObjectId.ToString()}");
-                await JobsBiz.UpdateJobStatusAsync(j.GId, JobStatus.Failed);
-            }
-        }
-
-
-        private static async Task SweepInternalJobsLogsAsync(AyContext ct, DateTime dtDeleteCutoff)
-        {
-            //Get the deleteable list (this is for reporting, could easily just do it in one go)
-            var logs = await ct.OpsJobLog
-                   .AsNoTracking()
-                   .Where(z => z.Created < dtDeleteCutoff)
-                   .OrderBy(z => z.Created)
-                   .ToListAsync();
-
-            log.LogTrace($"SweepInternalJobsLogsAsync processing: cutoff={dtDeleteCutoff.ToString()}, for {logs.Count.ToString()} log entries");
-
-            foreach (OpsJobLog l in logs)
-            {
-                try
-                {
-                    await ct.Database.ExecuteSqlInterpolatedAsync($"delete from aopsjoblog where gid = {l.GId}");
-                }
-                catch (Exception ex)
-                {
-                    log.LogError(ex, "SweepInternalJobsLogsAsync exception removed old log entries");
-                    throw (ex);
-                }
-            }
-        }
 
         /////////////////////////////////////////////////////////////////////