- Remove Dispatcher

Signed-off-by: Valery Piashchynski <[email protected]>

2 files changed, 34 insertions, 39 deletions

diff --git a/tests/plugins/jobs/configs/.rr-jobs-init.yaml b/tests/plugins/jobs/configs/.rr-jobs-init.yaml
index b21f764c..320f41b1 100644
--- a/tests/plugins/jobs/configs/.rr-jobs-init.yaml
+++ b/tests/plugins/jobs/configs/.rr-jobs-init.yaml
@@ -6,52 +6,49 @@ server:
   relay: "pipes"
   relay_timeout: "20s"
 
-jobs:
-  # worker pool configuration
-  pool:
-    num_workers: 4
-
-  # rabbitmq and similar servers
-  amqp:
-    addr:     amqp://guest:guest@localhost:5672/
+amqp:
+  addr: amqp://guest:guest@localhost:5672/
 
   # beanstalk configuration
-  beanstalk:
-    addr:    tcp://localhost:11300
+beanstalk:
+  addr: tcp://localhost:11300
 
   # amazon sqs configuration
-  sqs:
-    key:      api-key
-    secret:   api-secret
-    region:   us-west-1
-    endpoint: http://localhost:9324
-
-  # job destinations and options
-  dispatch:
-    spiral-jobs-tests-amqp-*.pipeline:      amqp
-    spiral-jobs-tests-local-*.pipeline:     local
-    spiral-jobs-tests-beanstalk-*.pipeline: beanstalk
-    spiral-jobs-tests-sqs-*.pipeline:       sqs
-
-  # list of broker pipelines associated with endpoints
-  pipelines:
-    local:
-      broker: ephemeral
+sqs:
+  key: api-key
+  secret: api-secret
+  region: us-west-1
+  endpoint: http://localhost:9324
 
-    amqp:
-      broker: amqp
-      queue:  default
 
-    beanstalk:
-      broker: beanstalk
-      tube:   default
+jobs:
+  # worker pool configuration
+  pool:
+    num_workers: 4
 
-    sqs:
-      broker: sqs
-      queue:  default
+  # list of broker pipelines associated with endpoints
+  pipelines:
+    test-local:
+      driver: ephemeral
+      priority: 10
+
+    test-1:
+      driver: amqp
+      priority: 1
+      queue: default
+
+    test-2:
+      driver: beanstalk
+      priority: 11
+      tube: default
+
+    test-3:
+      #      priority: 11 - not defined, 10 by default
+      driver: sqs
+      queue: default
       declare:
         MessageRetentionPeriod: 86400
 
   # list of pipelines to be consumed by the server, keep empty if you want to start consuming manually
-  consume: ["local", "amqp", "beanstalk", "sqs"]
+  consume: [ "test-local", "test-1" ]
 
diff --git a/tests/plugins/jobs/jobs_plugin_test.go b/tests/plugins/jobs/jobs_plugin_test.go
index 2c58c344..e8b4e83d 100644
--- a/tests/plugins/jobs/jobs_plugin_test.go
+++ b/tests/plugins/jobs/jobs_plugin_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/spiral/roadrunner/v2/plugins/config"
 	"github.com/spiral/roadrunner/v2/plugins/jobs"
 	"github.com/spiral/roadrunner/v2/plugins/jobs/brokers/ephemeral"
-	"github.com/spiral/roadrunner/v2/plugins/jobs/pq_plugin"
 	"github.com/spiral/roadrunner/v2/plugins/logger"
 	rpcPlugin "github.com/spiral/roadrunner/v2/plugins/rpc"
 	"github.com/spiral/roadrunner/v2/plugins/server"
@@ -35,7 +34,6 @@ func TestJobsInit(t *testing.T) {
 		&logger.ZapLogger{},
 		&jobs.Plugin{},
 		&ephemeral.Plugin{},
-		&pq_plugin.Plugin{},
 	)
 	assert.NoError(t, err)