diff options
-rw-r--r-- | app/config/config.yml | 16 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 1 | ||||
-rw-r--r-- | docs/de/developer/asynchronous.rst | 1 | ||||
-rw-r--r-- | docs/en/developer/asynchronous.rst | 1 | ||||
-rw-r--r-- | docs/fr/developer/asynchronous.rst | 1 |
5 files changed, 12 insertions, 8 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 2dd5c1de..591b5294 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -300,7 +300,7 @@ old_sound_rabbit_mq: | |||
300 | queue_options: | 300 | queue_options: |
301 | name: 'wallabag.import.pocket' | 301 | name: 'wallabag.import.pocket' |
302 | callback: wallabag_import.consumer.amqp.pocket | 302 | callback: wallabag_import.consumer.amqp.pocket |
303 | qos_options: {prefetch_count: 10} | 303 | qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} |
304 | import_readability: | 304 | import_readability: |
305 | connection: default | 305 | connection: default |
306 | exchange_options: | 306 | exchange_options: |
@@ -309,7 +309,7 @@ old_sound_rabbit_mq: | |||
309 | queue_options: | 309 | queue_options: |
310 | name: 'wallabag.import.readability' | 310 | name: 'wallabag.import.readability' |
311 | callback: wallabag_import.consumer.amqp.readability | 311 | callback: wallabag_import.consumer.amqp.readability |
312 | qos_options: {prefetch_count: 10} | 312 | qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} |
313 | import_instapaper: | 313 | import_instapaper: |
314 | connection: default | 314 | connection: default |
315 | exchange_options: | 315 | exchange_options: |
@@ -318,7 +318,7 @@ old_sound_rabbit_mq: | |||
318 | queue_options: | 318 | queue_options: |
319 | name: 'wallabag.import.instapaper' | 319 | name: 'wallabag.import.instapaper' |
320 | callback: wallabag_import.consumer.amqp.instapaper | 320 | callback: wallabag_import.consumer.amqp.instapaper |
321 | qos_options: {prefetch_count: 10} | 321 | qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} |
322 | import_pinboard: | 322 | import_pinboard: |
323 | connection: default | 323 | connection: default |
324 | exchange_options: | 324 | exchange_options: |
@@ -327,7 +327,7 @@ old_sound_rabbit_mq: | |||
327 | queue_options: | 327 | queue_options: |
328 | name: 'wallabag.import.pinboard' | 328 | name: 'wallabag.import.pinboard' |
329 | callback: wallabag_import.consumer.amqp.pinboard | 329 | callback: wallabag_import.consumer.amqp.pinboard |
330 | qos_options: {prefetch_count: 10} | 330 | qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} |
331 | import_wallabag_v1: | 331 | import_wallabag_v1: |
332 | connection: default | 332 | connection: default |
333 | exchange_options: | 333 | exchange_options: |
@@ -336,7 +336,7 @@ old_sound_rabbit_mq: | |||
336 | queue_options: | 336 | queue_options: |
337 | name: 'wallabag.import.wallabag_v1' | 337 | name: 'wallabag.import.wallabag_v1' |
338 | callback: wallabag_import.consumer.amqp.wallabag_v1 | 338 | callback: wallabag_import.consumer.amqp.wallabag_v1 |
339 | qos_options: {prefetch_count: 10} | 339 | qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} |
340 | import_wallabag_v2: | 340 | import_wallabag_v2: |
341 | connection: default | 341 | connection: default |
342 | exchange_options: | 342 | exchange_options: |
@@ -345,7 +345,7 @@ old_sound_rabbit_mq: | |||
345 | queue_options: | 345 | queue_options: |
346 | name: 'wallabag.import.wallabag_v2' | 346 | name: 'wallabag.import.wallabag_v2' |
347 | callback: wallabag_import.consumer.amqp.wallabag_v2 | 347 | callback: wallabag_import.consumer.amqp.wallabag_v2 |
348 | qos_options: {prefetch_count: 10} | 348 | qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} |
349 | import_firefox: | 349 | import_firefox: |
350 | connection: default | 350 | connection: default |
351 | exchange_options: | 351 | exchange_options: |
@@ -354,7 +354,7 @@ old_sound_rabbit_mq: | |||
354 | queue_options: | 354 | queue_options: |
355 | name: 'wallabag.import.firefox' | 355 | name: 'wallabag.import.firefox' |
356 | callback: wallabag_import.consumer.amqp.firefox | 356 | callback: wallabag_import.consumer.amqp.firefox |
357 | qos_options: {prefetch_count: 10} | 357 | qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} |
358 | import_chrome: | 358 | import_chrome: |
359 | connection: default | 359 | connection: default |
360 | exchange_options: | 360 | exchange_options: |
@@ -363,7 +363,7 @@ old_sound_rabbit_mq: | |||
363 | queue_options: | 363 | queue_options: |
364 | name: 'wallabag.import.chrome' | 364 | name: 'wallabag.import.chrome' |
365 | callback: wallabag_import.consumer.amqp.chrome | 365 | callback: wallabag_import.consumer.amqp.chrome |
366 | qos_options: {prefetch_count: 10} | 366 | qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} |
367 | 367 | ||
368 | fos_js_routing: | 368 | fos_js_routing: |
369 | routes_to_expose: | 369 | routes_to_expose: |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index a4dc0bde..97f51ed1 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -49,6 +49,7 @@ parameters: | |||
49 | rabbitmq_port: 5672 | 49 | rabbitmq_port: 5672 |
50 | rabbitmq_user: guest | 50 | rabbitmq_user: guest |
51 | rabbitmq_password: guest | 51 | rabbitmq_password: guest |
52 | rabbitmq_prefetch_count: 10 | ||
52 | 53 | ||
53 | # Redis processing | 54 | # Redis processing |
54 | redis_scheme: tcp | 55 | redis_scheme: tcp |
diff --git a/docs/de/developer/asynchronous.rst b/docs/de/developer/asynchronous.rst index 1707f321..742dd3e5 100644 --- a/docs/de/developer/asynchronous.rst +++ b/docs/de/developer/asynchronous.rst | |||
@@ -47,6 +47,7 @@ Bearbeite deine ``app/config/parameters.yml``-Datei, um die RabbitMQ-Parameter z | |||
47 | rabbitmq_port: 5672 | 47 | rabbitmq_port: 5672 |
48 | rabbitmq_user: guest | 48 | rabbitmq_user: guest |
49 | rabbitmq_password: guest | 49 | rabbitmq_password: guest |
50 | rabbitmq_prefetch_count: 10 # lesen http://www.rabbitmq.com/consumer-prefetch.html | ||
50 | 51 | ||
51 | RabbitMQ in wallabag aktivieren | 52 | RabbitMQ in wallabag aktivieren |
52 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | 53 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
diff --git a/docs/en/developer/asynchronous.rst b/docs/en/developer/asynchronous.rst index 5cd40231..2e409e4a 100644 --- a/docs/en/developer/asynchronous.rst +++ b/docs/en/developer/asynchronous.rst | |||
@@ -48,6 +48,7 @@ Edit your ``app/config/parameters.yml`` file to edit RabbitMQ configuration. The | |||
48 | rabbitmq_port: 5672 | 48 | rabbitmq_port: 5672 |
49 | rabbitmq_user: guest | 49 | rabbitmq_user: guest |
50 | rabbitmq_password: guest | 50 | rabbitmq_password: guest |
51 | rabbitmq_prefetch_count: 10 # read http://www.rabbitmq.com/consumer-prefetch.html | ||
51 | 52 | ||
52 | Enable RabbitMQ in wallabag | 53 | Enable RabbitMQ in wallabag |
53 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | 54 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ |
diff --git a/docs/fr/developer/asynchronous.rst b/docs/fr/developer/asynchronous.rst index 8a493acf..ff22daea 100644 --- a/docs/fr/developer/asynchronous.rst +++ b/docs/fr/developer/asynchronous.rst | |||
@@ -49,6 +49,7 @@ Modifiez votre fichier ``app/config/parameters.yml`` pour éditer la configurati | |||
49 | rabbitmq_port: 5672 | 49 | rabbitmq_port: 5672 |
50 | rabbitmq_user: guest | 50 | rabbitmq_user: guest |
51 | rabbitmq_password: guest | 51 | rabbitmq_password: guest |
52 | rabbitmq_prefetch_count: 10 # lire http://www.rabbitmq.com/consumer-prefetch.html | ||
52 | 53 | ||
53 | Activer RabbitMQ dans wallabag | 54 | Activer RabbitMQ dans wallabag |
54 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | 55 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |