aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-09-19 07:15:40 +0200
committerGitHub <noreply@github.com>2016-09-19 07:15:40 +0200
commitda18a4682f124b02278860d23ac1d59dee995277 (patch)
treeeabbe9da7203eea41e0cb0ec3c26b9b6599cf58f /app/config
parent0ed8ce55b5caf2c88e8330afa83abef6c4aac9a4 (diff)
parent59b97fae996d8307b9d957d210d46200f6d206bf (diff)
downloadwallabag-da18a4682f124b02278860d23ac1d59dee995277.tar.gz
wallabag-da18a4682f124b02278860d23ac1d59dee995277.tar.zst
wallabag-da18a4682f124b02278860d23ac1d59dee995277.zip
Merge pull request #1941 from wallabag/v2-asynchronous-jobs
Use asynchronous jobs for imports
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml64
-rw-r--r--app/config/parameters.yml.dist12
-rw-r--r--app/config/parameters_test.yml2
3 files changed, 77 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 31bd8a8c..4b869c4f 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -215,3 +215,67 @@ lexik_maintenance:
215 response: 215 response:
216 code: 503 216 code: 503
217 status: "wallabag Service Temporarily Unavailable" 217 status: "wallabag Service Temporarily Unavailable"
218
219old_sound_rabbit_mq:
220 connections:
221 default:
222 host: "%rabbitmq_host%"
223 port: "%rabbitmq_port%"
224 user: "%rabbitmq_user%"
225 password: "%rabbitmq_password%"
226 vhost: /
227 lazy: true
228 producers:
229 import_pocket:
230 connection: default
231 exchange_options:
232 name: 'wallabag.import.pocket'
233 type: topic
234 import_readability:
235 connection: default
236 exchange_options:
237 name: 'wallabag.import.readability'
238 type: topic
239 import_wallabag_v1:
240 connection: default
241 exchange_options:
242 name: 'wallabag.import.wallabag_v1'
243 type: topic
244 import_wallabag_v2:
245 connection: default
246 exchange_options:
247 name: 'wallabag.import.wallabag_v2'
248 type: topic
249 consumers:
250 import_pocket:
251 connection: default
252 exchange_options:
253 name: 'wallabag.import.pocket'
254 type: topic
255 queue_options:
256 name: 'wallabag.import.pocket'
257 callback: wallabag_import.consumer.amqp.pocket
258 import_readability:
259 connection: default
260 exchange_options:
261 name: 'wallabag.import.readability'
262 type: topic
263 queue_options:
264 name: 'wallabag.import.readability'
265 callback: wallabag_import.consumer.amqp.readability
266 import_wallabag_v1:
267 connection: default
268 exchange_options:
269 name: 'wallabag.import.wallabag_v1'
270 type: topic
271 queue_options:
272 name: 'wallabag.import.wallabag_v1'
273 callback: wallabag_import.consumer.amqp.wallabag_v1
274 import_wallabag_v2:
275 connection: default
276 exchange_options:
277 name: 'wallabag.import.wallabag_v2'
278 type: topic
279 queue_options:
280 name: 'wallabag.import.wallabag_v2'
281 callback: wallabag_import.consumer.amqp.wallabag_v2
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index d092e139..f2e5bec3 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -38,3 +38,15 @@ parameters:
38 fosuser_confirmation: true 38 fosuser_confirmation: true
39 39
40 from_email: no-reply@wallabag.org 40 from_email: no-reply@wallabag.org
41
42 rss_limit: 50
43
44 # RabbitMQ processing
45 rabbitmq_host: localhost
46 rabbitmq_port: 5672
47 rabbitmq_user: guest
48 rabbitmq_password: guest
49
50 # Redis processing
51 redis_host: localhost
52 redis_port: 6379
diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml
index 696c95ef..2943b27a 100644
--- a/app/config/parameters_test.yml
+++ b/app/config/parameters_test.yml
@@ -5,4 +5,4 @@ parameters:
5 test_database_name: null 5 test_database_name: null
6 test_database_user: null 6 test_database_user: null
7 test_database_password: null 7 test_database_password: null
8 test_database_path: '%kernel.root_dir%/../data/db/wallabag_testYO.sqlite' 8 test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite'