Merge pull request #642 from poppastring/updated-scheduler

Updated scheduling to use Coravel

Author: poppastring

source/DasBlog.Services/DasBlog.Services.csproj

@@ -12,11 +12,12 @@
     <ProjectReference Include="..\DasBlog.Web.Core\DasBlog.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Coravel" Version="4.1.2" />
     <PackageReference Include="Kveer.XmlRPC" Version="1.2.0" />
     <PackageReference Include="MailKit" Version="2.15.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="Quartz.AspNetCore" Version="3.3.3" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />

source/DasBlog.Services/Scheduler/SiteReport.cs

@@ -4,14 +4,14 @@
 using System.Net.Mail;
 using System.Text;
 using System.Threading.Tasks;
+using Coravel.Invocable;
 using DasBlog.Services.ActivityLogs;
 using Microsoft.Extensions.Logging;
 using newtelligence.DasBlog.Runtime;
-using Quartz;
 
 namespace DasBlog.Services.Scheduler
 {
-	public class SiteEmailReport : IJob
+	public class SiteEmailReport : IInvocable
 	{
 		private readonly ILogger<SiteEmailReport> logger;
 		private readonly IActivityService activityService;
@@ -34,11 +34,11 @@ public SiteEmailReport(ILogger<SiteEmailReport> logger, IActivityService activit
 			EMAIL_TITLE = string.Format("Weblog Daily Activity Report for {0}, {1}", midnight.DayOfWeek, midnight.ToString("MMMM dd, yyyy"));
 		}
 
-		public async Task Execute(IJobExecutionContext context)
+		public async Task Invoke()
 		{
 			if(dasBlogSettings.SiteConfiguration.EnableDailyReportEmail)
 			{ 
-				logger.LogInformation(context.JobDetail.Key + " job executing, triggered by " + context.Trigger.Key);
+				logger.LogInformation("Daily email report triggered");
 
 				var emailbody = FormatEmail();
 

source/DasBlog.Web.UI/DasBlog.Web.csproj

@@ -22,6 +22,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="10.1.1" />
+    <PackageReference Include="Coravel" Version="4.1.2" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" />    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.0" />
@@ -31,7 +32,7 @@
     <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
     <PackageReference Include="reCAPTCHA.AspNetCore" Version="3.0.10" />
     <PackageReference Include="Quartz.AspNetCore" Version="3.3.3" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DasBlog.CLI\DasBlog.CLI.csproj" />

source/DasBlog.Web.UI/Startup.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using Coravel;
 using DasBlog.Core.Common;
 using DasBlog.Managers;
 using DasBlog.Managers.Interfaces;
@@ -29,7 +30,6 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Quartz;
 using System;
 using System.IO;
 using System.Linq;
@@ -178,6 +178,9 @@ public void ConfigureServices(IServiceCollection services)
 			services
 				.AddHttpContextAccessor();
 
+			services.AddScheduler();
+			services.AddTransient<SiteEmailReport>();
+
 			services
 				.AddTransient<IDasBlogSettings, DasBlogSettings>()
 				.AddTransient<IUserStore<DasBlogUser>, DasBlogUserStore>()
@@ -237,46 +240,6 @@ public void ConfigureServices(IServiceCollection services)
 				options.CheckConsentNeeded = context => flag;
 				options.MinimumSameSitePolicy = SameSiteMode.None;
 			});
-
-			services.AddQuartz(q =>
-			{
-				q.SchedulerId = "Scheduler-Core";
-
-				q.UseMicrosoftDependencyInjectionJobFactory(options =>
-				{
-					// if we don't have the job in DI, allow fallback to configure via default constructor
-					options.AllowDefaultConstructor = true;
-				});
-
-				q.UseSimpleTypeLoader();
-				q.UseInMemoryStore();
-				q.UseDefaultThreadPool(tp =>
-				{
-					tp.MaxConcurrency = 10;
-				});
-
-				var jobKey = new JobKey("key1", "main-group");
-
-				q.AddJob<SiteEmailReport>(j => j
-					.StoreDurably()
-					.WithIdentity(jobKey)
-					.WithDescription("Site report job")
-				);
-
-				q.AddTrigger(t => t
-					.WithIdentity("Simple Trigger")
-					.ForJob(jobKey)
-					.StartNow()
-					.WithSchedule(CronScheduleBuilder.DailyAtHourAndMinute(23, 45))
-					.WithDescription("my awesome simple trigger")
-
-				);
-			});
-
-			services.AddQuartzServer(options =>
-			{
-				options.WaitForJobsToComplete = true;
-			});
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -299,6 +262,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IDasBlog
 				app.UseHsts(options => options.MaxAge(days: 30));
 			}
 
+			app.ApplicationServices.UseScheduler(scheduler =>
+			{
+				scheduler
+					.Schedule<SiteEmailReport>()
+					.DailyAt(23, 19)
+					.Zoned(TimeZoneInfo.Local);
+			});
+
 			if (!siteOk)
 			{
 				app.Run(async context => await context.Response.WriteAsync(siteError));