3 files changed, 115 insertions, 29 deletions
diff --git a/src/Wallabag/ImportBundle/Resources/config/rabbit.yml b/src/Wallabag/ImportBundle/Resources/config/rabbit.yml
new file mode 100644
index 00000000..f09dda0d
--- /dev/null
+++ b/src/Wallabag/ImportBundle/Resources/config/rabbit.yml
@@ -0,0 +1,30 @@
+# RabbitMQ stuff
+services:
+    wallabag_import.consumer.ampq.pocket:
+        class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "@wallabag_user.user_repository"
+            - "@wallabag_import.pocket.import"
+            - "@logger"
+    wallabag_import.consumer.ampq.readability:
+        class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "@wallabag_user.user_repository"
+            - "@wallabag_import.readability.import"
+            - "@logger"
+    wallabag_import.consumer.ampq.wallabag_v1:
+        class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "@wallabag_user.user_repository"
+            - "@wallabag_import.wallabag_v1.import"
+            - "@logger"
+    wallabag_import.consumer.ampq.wallabag_v2:
+        class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "@wallabag_user.user_repository"
+            - "@wallabag_import.wallabag_v2.import"
+            - "@logger"
diff --git a/src/Wallabag/ImportBundle/Resources/config/redis.yml b/src/Wallabag/ImportBundle/Resources/config/redis.yml
new file mode 100644
index 00000000..7d3248e5
--- /dev/null
+++ b/src/Wallabag/ImportBundle/Resources/config/redis.yml
@@ -0,0 +1,81 @@
+# Redis stuff
+services:
+    # readability
+    wallabag_import.queue.redis.readability:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            - "@wallabag_core.redis.client"
+            - "wallabag.import.readability"
+    wallabag_import.producer.redis.readability:
+        class: Wallabag\ImportBundle\Redis\Producer
+        arguments:
+            - "@wallabag_import.queue.redis.readability"
+    wallabag_import.consumer.redis.readability:
+        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "@wallabag_user.user_repository"
+            - "@wallabag_import.readability.import"
+            - "@logger"
+    # pocket
+    wallabag_import.queue.redis.pocket:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            - "@wallabag_core.redis.client"
+            - "wallabag.import.pocket"
+    wallabag_import.producer.redis.pocket:
+        class: Wallabag\ImportBundle\Redis\Producer
+        arguments:
+            - "@wallabag_import.queue.redis.pocket"
+    wallabag_import.consumer.redis.pocket:
+        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "@wallabag_user.user_repository"
+            - "@wallabag_import.pocket.import"
+            - "@logger"
+    # wallabag v1
+    wallabag_import.queue.redis.wallabag_v1:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            - "@wallabag_core.redis.client"
+            - "wallabag.import.wallabag_v1"
+    wallabag_import.producer.redis.wallabag_v1:
+        class: Wallabag\ImportBundle\Redis\Producer
+        arguments:
+            - "@wallabag_import.queue.redis.wallabag_v1"
+    wallabag_import.consumer.redis.wallabag_v1:
+        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "@wallabag_user.user_repository"
+            - "@wallabag_import.wallabag_v1.import"
+            - "@logger"
+    # wallabag v2
+    wallabag_import.queue.redis.wallabag_v2:
+        class: Simpleue\Queue\RedisQueue
+        arguments:
+            - "@wallabag_core.redis.client"
+            - "wallabag.import.wallabag_v2"
+    wallabag_import.producer.redis.wallabag_v2:
+        class: Wallabag\ImportBundle\Redis\Producer
+        arguments:
+            - "@wallabag_import.queue.redis.wallabag_v2"
+    wallabag_import.consumer.redis.wallabag_v2:
+        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+        arguments:
+            - "@doctrine.orm.entity_manager"
+            - "@wallabag_user.user_repository"
+            - "@wallabag_import.wallabag_v2.import"
+            - "@logger"
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml
index cad44e71..f03404ae 100644
--- a/src/Wallabag/ImportBundle/Resources/config/services.yml
+++ b/src/Wallabag/ImportBundle/Resources/config/services.yml
@@ -1,33 +1,8 @@
-services:
+imports:
-    wallabag_import.consumer.pocket:
+    - { resource: rabbit.yml }
-        class: Wallabag\ImportBundle\Consumer\AMPQ\EntryConsumer
+    - { resource: redis.yml }
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - "@wallabag_user.user_repository"
-            - "@wallabag_import.pocket.import"
-            - "@logger"
-    wallabag_import.consumer.readability:
-        class: Wallabag\ImportBundle\Consumer\AMPQ\EntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - "@wallabag_user.user_repository"
-            - "@wallabag_import.readability.import"
-            - "@logger"
-    wallabag_import.consumer.wallabag_v1:
-        class: Wallabag\ImportBundle\Consumer\AMPQ\EntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - "@wallabag_user.user_repository"
-            - "@wallabag_import.wallabag_v1.import"
-            - "@logger"
-    wallabag_import.consumer.wallabag_v2:
-        class: Wallabag\ImportBundle\Consumer\AMPQ\EntryConsumer
-        arguments:
-            - "@doctrine.orm.entity_manager"
-            - "@wallabag_user.user_repository"
-            - "@wallabag_import.wallabag_v2.import"
-            - "@logger"
+services:
    wallabag_import.chain:
        class: Wallabag\ImportBundle\Import\ImportChain

diff --git a/src/Wallabag/ImportBundle/Resources/config/rabbit.yml b/src/Wallabag/ImportBundle/Resources/config/rabbit.yml new file mode 100644 index 00000000..f09dda0d --- /dev/null +++ b/src/Wallabag/ImportBundle/Resources/config/rabbit.yml
@@ -0,0 +1,30 @@
		1	# RabbitMQ stuff
		2	services:
		3	wallabag_import.consumer.ampq.pocket:
		4	class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer
		5	arguments:
		6	- "@doctrine.orm.entity_manager"
		7	- "@wallabag_user.user_repository"
		8	- "@wallabag_import.pocket.import"
		9	- "@logger"
		10	wallabag_import.consumer.ampq.readability:
		11	class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer
		12	arguments:
		13	- "@doctrine.orm.entity_manager"
		14	- "@wallabag_user.user_repository"
		15	- "@wallabag_import.readability.import"
		16	- "@logger"
		17	wallabag_import.consumer.ampq.wallabag_v1:
		18	class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer
		19	arguments:
		20	- "@doctrine.orm.entity_manager"
		21	- "@wallabag_user.user_repository"
		22	- "@wallabag_import.wallabag_v1.import"
		23	- "@logger"
		24	wallabag_import.consumer.ampq.wallabag_v2:
		25	class: Wallabag\ImportBundle\Consumer\AMPQEntryConsumer
		26	arguments:
		27	- "@doctrine.orm.entity_manager"
		28	- "@wallabag_user.user_repository"
		29	- "@wallabag_import.wallabag_v2.import"
		30	- "@logger"


diff --git a/src/Wallabag/ImportBundle/Resources/config/redis.yml b/src/Wallabag/ImportBundle/Resources/config/redis.yml new file mode 100644 index 00000000..7d3248e5 --- /dev/null +++ b/src/Wallabag/ImportBundle/Resources/config/redis.yml
@@ -0,0 +1,81 @@
		1	# Redis stuff
		2	services:
		3	# readability
		4	wallabag_import.queue.redis.readability:
		5	class: Simpleue\Queue\RedisQueue
		6	arguments:
		7	- "@wallabag_core.redis.client"
		8	- "wallabag.import.readability"
		9
		10	wallabag_import.producer.redis.readability:
		11	class: Wallabag\ImportBundle\Redis\Producer
		12	arguments:
		13	- "@wallabag_import.queue.redis.readability"
		14
		15	wallabag_import.consumer.redis.readability:
		16	class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
		17	arguments:
		18	- "@doctrine.orm.entity_manager"
		19	- "@wallabag_user.user_repository"
		20	- "@wallabag_import.readability.import"
		21	- "@logger"
		22
		23	# pocket
		24	wallabag_import.queue.redis.pocket:
		25	class: Simpleue\Queue\RedisQueue
		26	arguments:
		27	- "@wallabag_core.redis.client"
		28	- "wallabag.import.pocket"
		29
		30	wallabag_import.producer.redis.pocket:
		31	class: Wallabag\ImportBundle\Redis\Producer
		32	arguments:
		33	- "@wallabag_import.queue.redis.pocket"
		34
		35	wallabag_import.consumer.redis.pocket:
		36	class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
		37	arguments:
		38	- "@doctrine.orm.entity_manager"
		39	- "@wallabag_user.user_repository"
		40	- "@wallabag_import.pocket.import"
		41	- "@logger"
		42
		43	# wallabag v1
		44	wallabag_import.queue.redis.wallabag_v1:
		45	class: Simpleue\Queue\RedisQueue
		46	arguments:
		47	- "@wallabag_core.redis.client"
		48	- "wallabag.import.wallabag_v1"
		49
		50	wallabag_import.producer.redis.wallabag_v1:
		51	class: Wallabag\ImportBundle\Redis\Producer
		52	arguments:
		53	- "@wallabag_import.queue.redis.wallabag_v1"
		54
		55	wallabag_import.consumer.redis.wallabag_v1:
		56	class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
		57	arguments:
		58	- "@doctrine.orm.entity_manager"
		59	- "@wallabag_user.user_repository"
		60	- "@wallabag_import.wallabag_v1.import"
		61	- "@logger"
		62
		63	# wallabag v2
		64	wallabag_import.queue.redis.wallabag_v2:
		65	class: Simpleue\Queue\RedisQueue
		66	arguments:
		67	- "@wallabag_core.redis.client"
		68	- "wallabag.import.wallabag_v2"
		69
		70	wallabag_import.producer.redis.wallabag_v2:
		71	class: Wallabag\ImportBundle\Redis\Producer
		72	arguments:
		73	- "@wallabag_import.queue.redis.wallabag_v2"
		74
		75	wallabag_import.consumer.redis.wallabag_v2:
		76	class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
		77	arguments:
		78	- "@doctrine.orm.entity_manager"
		79	- "@wallabag_user.user_repository"
		80	- "@wallabag_import.wallabag_v2.import"
		81	- "@logger"


diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml index cad44e71..f03404ae 100644 --- a/src/Wallabag/ImportBundle/Resources/config/services.yml +++ b/src/Wallabag/ImportBundle/Resources/config/services.yml
@@ -1,33 +1,8 @@
1	services:	1	imports:
2	wallabag_import.consumer.pocket:	2	- { resource: rabbit.yml }
3	class: Wallabag\ImportBundle\Consumer\AMPQ\EntryConsumer	3	- { resource: redis.yml }
4	arguments:
5	- "@doctrine.orm.entity_manager"
6	- "@wallabag_user.user_repository"
7	- "@wallabag_import.pocket.import"
8	- "@logger"
9	wallabag_import.consumer.readability:
10	class: Wallabag\ImportBundle\Consumer\AMPQ\EntryConsumer
11	arguments:
12	- "@doctrine.orm.entity_manager"
13	- "@wallabag_user.user_repository"
14	- "@wallabag_import.readability.import"
15	- "@logger"
16	wallabag_import.consumer.wallabag_v1:
17	class: Wallabag\ImportBundle\Consumer\AMPQ\EntryConsumer
18	arguments:
19	- "@doctrine.orm.entity_manager"
20	- "@wallabag_user.user_repository"
21	- "@wallabag_import.wallabag_v1.import"
22	- "@logger"
23	wallabag_import.consumer.wallabag_v2:
24	class: Wallabag\ImportBundle\Consumer\AMPQ\EntryConsumer
25	arguments:
26	- "@doctrine.orm.entity_manager"
27	- "@wallabag_user.user_repository"
28	- "@wallabag_import.wallabag_v2.import"
29	- "@logger"
30		4
		5	services:
31	wallabag_import.chain:	6	wallabag_import.chain:
32	class: Wallabag\ImportBundle\Import\ImportChain	7	class: Wallabag\ImportBundle\Import\ImportChain
33		8