lua find fix

coronabytes · coronabytes · commit b6fdd0ae969f · 2025-12-10T12:02:40.000+01:00
diff --git a/Core.TaskProcessor.SampleWebApi/Program.cs b/Core.TaskProcessor.SampleWebApi/Program.cs
@@ -70,17 +70,17 @@
 
     //var discarded = await proc.DiscardDeadTasksAsync("default");
 
-    //await proc.UpsertScheduleAsync(new ScheduleData
-    //{
-    //    Id = "refresh",
-    //    Tenant = "core",
-    //    Queue = "default",
-    //    Cron = "0 */2 * * * *",
-    //    Timezone = "Etc/UTC",
-    //    Unique = true
-    //}, () => faulty.DoFaultyStuff());
-
-    await proc.EnqueueTaskAsync("default", "core", () => faulty.DoFaultyStuff());
+    await proc.UpsertScheduleAsync(new ScheduleData
+    {
+        Id = "refresh",
+        Tenant = "core",
+        Queue = "default",
+        Cron = "*/10 * * * * *",
+        Timezone = "Etc/UTC",
+        Unique = true
+    }, () => svc.DoSomething("test"));
+
+    //await proc.EnqueueTaskAsync("default", "core", () => faulty.DoFaultyStuff());
     //await proc.EnqueueTaskAsync("default", "core", () => svc.DoSomethingAsync("test", CancellationToken.None));
     //await proc.EnqueueTaskAsync("default", "core", () => svc.DoSomethingAsync("test-delay", CancellationToken.None), delayUntil: DateTimeOffset.UtcNow.AddSeconds(5));
 }
diff --git a/Core.TaskProcessor/TaskProcessor.cs b/Core.TaskProcessor/TaskProcessor.cs
@@ -2,7 +2,6 @@
 using StackExchange.Redis;
 using System.Collections.Concurrent;
 using System.Linq.Expressions;
-using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
 
 namespace Core.TaskProcessor;
@@ -282,7 +281,7 @@ public async Task<bool> FetchAsync()
             var res = await db.ScriptEvaluateAsync($@"
 for i, queue in ipairs(KEYS) do
 
-if string.find(queue, '[fair]') then
+if string.find(queue, '%[fair%]') ~= nil then
   local tenant = redis.call('hrandfield', queue.."":fairness"");
 
   if tenant then
@@ -540,7 +539,7 @@ await db.ScriptEvaluateAsync($@"
   for j, w in ipairs(r) do
     redis.call('zadd', ""{Prefix("queues")}"", t, v);
     
-    if string.find(q, '[fair]') then
+    if string.find(q, '%[fair%]') ~= nil then
       local tenant = redis.call('hget', q..':'..w, 'tenant');
       redis.call('hincrby', q..':fairness', tenant);
       redis.call('lpush', q..':'..tenant, taskId);
@@ -597,7 +596,7 @@ public async Task<long> RetryDeadTasksAsync(string queue, int? retries = null, l
   redis.call('hincrby', '{Prefix("batch:")}'..batchId, 'failed', -1)
   redis.call('hset', '{Prefix("batch:")}'..batchId, 'state', 'go')
 
-  if string.find(KEYS[1], '[fair]') then
+  if string.find(KEYS[1], '%[fair%]') ~= nil then
     local tenant = redis.call('hget', ""{Prefix("task:")}""..taskId, 'tenant');
     redis.call('hincrby', KEYS[1]..':fairness', tenant);
     redis.call('lpush', KEYS[1]..':'..tenant, taskId);
@@ -853,7 +852,7 @@ private async Task CompleteBatchAsync(TaskContext task, IDatabase db)
 
   redis.call('zadd', ""{Prefix("queues")}"", t, q);
 
-  if string.find(queue, '[fair]') then
+  if string.find(queue, '%[fair%]') ~= nil then
      local tenant = redis.call('hget', '{Prefix("task:")}'..taskId, 'tenant');
      redis.call('hincrby', '{Prefix("queue:")}'..q..':fairness', tenant);
      redis.call('lpush', '{Prefix("queue:")}'..q..':'..tenant, taskId);
