fix: added default queues for triggers

delegateas · Aug 21, 2024 · 12c98e9 · 12c98e9
1 parent 3d85d29
commit 12c98e9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/WorkflowEngine.Core/TriggerContext.cs b/src/WorkflowEngine.Core/TriggerContext.cs
@@ -27,6 +27,7 @@ public static TriggerContext CreateTrigger(this IWorkflow workflow, Dictionary<s
     }
     public class TriggerContext : ITriggerContext, IFormattable
     {
+        public string Queue { get; set; }
         public IWorkflow Workflow { get; set; }
         public ITrigger Trigger { get; set; }
         public string PrincipalId { get; set; }

diff --git a/src/WorkflowEngine.Hangfire/HangfireWorkflowExecutor.cs b/src/WorkflowEngine.Hangfire/HangfireWorkflowExecutor.cs
@@ -35,7 +35,7 @@ public static class BackgroundClientExtensions
         public static string TriggerAsync<TTriggerContext>(this IBackgroundJobClient backgroundJobClient, TTriggerContext trigger)
             where TTriggerContext : TriggerContext
         {
-            var job = backgroundJobClient.Enqueue<IHangfireWorkflowExecutor>(
+            var job = backgroundJobClient.Enqueue<IHangfireWorkflowExecutor>(trigger.Queue ?? "default",
                         (executor) => executor.TriggerAsync(trigger, null));
 
             return job;

diff --git a/src/WorkflowEngine.Hangfire/WorkflowStarterBackgroundJob.cs b/src/WorkflowEngine.Hangfire/WorkflowStarterBackgroundJob.cs
@@ -1,6 +1,7 @@
 using Hangfire;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,6 +12,10 @@
 
 namespace Microsoft.Extensions.DependencyInjection
 {
+    public class WorkflowStarterBackgroundJobOptions
+    {
+        public string QueueName { get; set; } = "default";
+    }
     public class WorkflowStarterBackgroundJob : BackgroundService
     {
         private readonly IServiceScopeFactory _serviceScopeFactory;
@@ -31,6 +36,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                 var workflows = sp.GetRequiredService<IWorkflowRepository>();
                 var jobs = sp.GetRequiredService<IRecurringJobManager>();
                 var configuration = sp.GetRequiredService<IConfiguration>();
+                var options = sp.GetRequiredService<IOptions<WorkflowStarterBackgroundJobOptions>>();
+
 
                 foreach (var workflow in await workflows.GetAllWorkflows())
                 {
@@ -52,21 +59,23 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
                             workflow.Manifest = null;
 
-                            jobs.AddOrUpdate(workflow.Id.ToString() + trigger.Key,
+                            jobs.AddOrUpdate(workflow.Id.ToString() + trigger.Key, options.Value.QueueName,
                                  (System.Linq.Expressions.Expression<System.Action<IHangfireWorkflowExecutor>>) ((executor) => executor.TriggerAsync(new TriggerContext
                                  {
+                                     Queue = options.Value.QueueName,
                                      PrincipalId = "1b714972-8d0a-4feb-b166-08d93c6ae328",
                                      Workflow = workflow,
                                      Trigger = new Trigger
                                      {
+
                                          Inputs = trigger.Value.Inputs,
                                          ScheduledTime = DateTimeOffset.UtcNow,
                                          Type = trigger.Value.Type,
                                          Key = trigger.Key
                                      },
                                  }, null)), trigger.Value.Inputs["cronExpression"] as string,new RecurringJobOptions
                                  {
-                                      TimeZone = GetTimeZone(trigger)
+                                      TimeZone = GetTimeZone(trigger),  
                                  });