allow Task.Cron and Task.Gate to be used together (#26)

xh3b4sd · Oct 16, 2023 · e7b31c8 · e7b31c8
1 parent d4b2bc8
commit e7b31c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 24 deletions.
diff --git a/engine/create.go b/engine/create.go
@@ -148,9 +148,6 @@ func (e *Engine) verCre(tas *task.Task) (*ticker.Ticker, error) {
 				wai = true
 			}
 
-			if tri && tas.Cron != nil {
-				return nil, tracer.Maskf(labelValueError, "Task.Gate must not contain reserved value [trigger] if Task.Cron is configured")
-			}
 			if tri && wai {
 				return nil, tracer.Maskf(labelValueError, "Task.Gate must not contain both of the reserved values [trigger waiting] together")
 			}

diff --git a/engine/engine_create_redis_test.go b/engine/engine_create_redis_test.go
@@ -288,25 +288,6 @@ func Test_Engine_Create_Cron(t *testing.T) {
 			},
 		}
 
-		err = eon.Create(tas)
-		if !IsLabelValue(err) {
-			t.Fatal(err)
-		}
-	}
-
-	{
-		tas := &task.Task{
-			Cron: &task.Cron{
-				task.Aevery: "hour",
-			},
-			Meta: &task.Meta{
-				"test.api.io/key": "bar",
-			},
-			Gate: &task.Gate{
-				"test.api.io/k-0": task.Waiting,
-			},
-		}
-
 		err = eon.Create(tas)
 		if err != nil {
 			t.Fatal(err)
@@ -342,8 +323,8 @@ func Test_Engine_Create_Cron(t *testing.T) {
 		if lis[1].Cron.Get().Aevery() != "hour" {
 			t.Fatal("expected", "hour", "got", lis[1].Cron.Get().Aevery())
 		}
-		if lis[1].Gate.Get("test.api.io/k-0") != task.Waiting {
-			t.Fatal("expected", task.Waiting, "got", lis[1].Gate.Get("test.api.io/k-0"))
+		if lis[1].Gate.Get("test.api.io/k-0") != task.Trigger {
+			t.Fatal("expected", task.Trigger, "got", lis[1].Gate.Get("test.api.io/k-0"))
 		}
 	}