Upgraded Sample to use the latest Quartz integration

MassTransit · Jul 19, 2022 · 741edd7 · 741edd7
1 parent 25386e6
commit 741edd7
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 175 deletions.
diff --git a/Sample-Quartz.sln.DotSettings b/Sample-Quartz.sln.DotSettings
@@ -194,4 +194,9 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Interfaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb_aaBb" /&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb_AaBb" /&gt;&lt;/Policy&gt;</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb_aaBb" /&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb_AaBb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/QuartzService/CancelScheduledMessageConsumerDefinition.cs b/src/QuartzService/CancelScheduledMessageConsumerDefinition.cs
diff --git a/src/QuartzService/MassTransitQuartzRegistrationExtensions.cs b/src/QuartzService/MassTransitQuartzRegistrationExtensions.cs
diff --git a/src/QuartzService/QuartzEndpointDefinition.cs b/src/QuartzService/QuartzEndpointDefinition.cs
diff --git a/src/QuartzService/QuartzEndpointOptions.cs b/src/QuartzService/QuartzEndpointOptions.cs
diff --git a/src/QuartzService/QuartzService.csproj b/src/QuartzService/QuartzService.csproj
@@ -5,12 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MassTransit.Quartz" Version="8.0.0" />
-    <PackageReference Include="MassTransit.RabbitMQ" Version="8.0.0" />
+    <PackageReference Include="MassTransit.Quartz" Version="8.0.5" />
+    <PackageReference Include="MassTransit.RabbitMQ" Version="8.0.5" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.4" />
-    <PackageReference Include="Quartz.Extensions.Hosting" Version="3.3.3" />
-    <PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.3.3" />
-    <PackageReference Include="Quartz.Serialization.Json" Version="3.3.3" />
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
   </ItemGroup>

diff --git a/src/QuartzService/ScheduleMessageConsumerDefinition.cs b/src/QuartzService/ScheduleMessageConsumerDefinition.cs
diff --git a/src/QuartzService/Startup.cs b/src/QuartzService/Startup.cs
@@ -1,13 +1,8 @@
 namespace QuartzService;
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using MassTransit;
-using MassTransit.Serialization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.AspNetCore.Hosting;
@@ -70,24 +65,34 @@ public void ConfigureServices(IServiceCollection services)
             });
         });
 
-        services.Configure<QuartzEndpointOptions>(Configuration.GetSection("QuartzEndpoint"));
-
-
         services.AddMassTransit(x =>
         {
+            x.AddPublishMessageScheduler();
+
             x.AddQuartzConsumers();
 
+            x.AddConsumer<SampleConsumer>();
+
             x.UsingRabbitMq((context, cfg) =>
             {
+                cfg.UsePublishMessageScheduler();
+
                 cfg.ConfigureEndpoints(context);
             });
         });
 
+        services.Configure<MassTransitHostOptions>(options =>
+        {
+            options.WaitUntilStarted = true;
+        });
+
         services.AddQuartzHostedService(options =>
         {
             options.StartDelay = TimeSpan.FromSeconds(5);
             options.WaitForJobsToComplete = true;
         });
+
+        services.AddHostedService<SuperWorker>();
     }
 
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
@@ -116,28 +121,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
     public static Task HealthCheckResponseWriter(HttpContext context, HealthReport result)
     {
         context.Response.ContentType = "application/json";
-        return context.Response.WriteAsync(ToJsonString(result));
-    }
-
-    static string ToJsonString(HealthReport result)
-    {
-        var healthResult = new JsonObject
-        {
-            ["status"] = result.Status.ToString(),
-            ["results"] = new JsonObject(result.Entries.Select(entry => new KeyValuePair<string, JsonNode>(entry.Key,
-                new JsonObject
-                {
-                    ["status"] = entry.Value.Status.ToString(),
-                    ["description"] = entry.Value.Description,
-                    ["data"] = JsonSerializer.SerializeToNode(entry.Value.Data, SystemTextJsonMessageSerializer.Options)
-                }))!)
-        };
-
-        var options = new System.Text.Json.JsonSerializerOptions
-        {
-            WriteIndented = true,
-        };
-
-        return healthResult.ToJsonString(options);
+        return context.Response.WriteAsync(result.ToJsonString());
     }
 }
diff --git a/src/QuartzService/SuperWorker.cs b/src/QuartzService/SuperWorker.cs
@@ -0,0 +1,50 @@
+namespace QuartzService;
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using MassTransit;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+
+public class SuperWorker :
+    BackgroundService
+{
+    readonly IMessageScheduler _messageScheduler;
+
+    public SuperWorker(IMessageScheduler messageScheduler)
+    {
+        _messageScheduler = messageScheduler;
+    }
+
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        await _messageScheduler.SchedulePublish(TimeSpan.FromSeconds(15), new DemoMessage() { Value = "Hello, World" }, cancellationToken: stoppingToken);
+    }
+}
+
+
+public class DemoMessage
+{
+    public string Value { get; set; }
+}
+
+
+public class SampleConsumer :
+    IConsumer<DemoMessage>
+{
+    readonly ILogger<SampleConsumer> _logger;
+
+    public SampleConsumer(ILogger<SampleConsumer> logger)
+    {
+        _logger = logger;
+    }
+
+    public Task Consume(ConsumeContext<DemoMessage> context)
+    {
+        _logger.LogInformation("Received scheduled message: {Value}", context.Message.Value);
+
+        return Task.CompletedTask;
+    }
+}