From 881b0578e782e947706124a4e1d625a3dd3ddc1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 15 Dec 2016 21:58:20 +0100
Subject: Moved RabbitMQ QoS to parameters

---
 app/config/config.yml              | 16 ++++++++--------
 app/config/parameters.yml.dist     |  1 +
 docs/de/developer/asynchronous.rst |  1 +
 docs/en/developer/asynchronous.rst |  1 +
 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:
             queue_options:
                 name: 'wallabag.import.pocket'
             callback: wallabag_import.consumer.amqp.pocket
-            qos_options: {prefetch_count: 10}
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_readability:
             connection: default
             exchange_options:
@@ -309,7 +309,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.readability'
             callback: wallabag_import.consumer.amqp.readability
-            qos_options: {prefetch_count: 10}
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_instapaper:
             connection: default
             exchange_options:
@@ -318,7 +318,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.instapaper'
             callback: wallabag_import.consumer.amqp.instapaper
-            qos_options: {prefetch_count: 10}
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_pinboard:
             connection: default
             exchange_options:
@@ -327,7 +327,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.pinboard'
             callback: wallabag_import.consumer.amqp.pinboard
-            qos_options: {prefetch_count: 10}
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v1:
             connection: default
             exchange_options:
@@ -336,7 +336,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.wallabag_v1'
             callback: wallabag_import.consumer.amqp.wallabag_v1
-            qos_options: {prefetch_count: 10}
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v2:
             connection: default
             exchange_options:
@@ -345,7 +345,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.wallabag_v2'
             callback: wallabag_import.consumer.amqp.wallabag_v2
-            qos_options: {prefetch_count: 10}
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_firefox:
             connection: default
             exchange_options:
@@ -354,7 +354,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.firefox'
             callback: wallabag_import.consumer.amqp.firefox
-            qos_options: {prefetch_count: 10}
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_chrome:
             connection: default
             exchange_options:
@@ -363,7 +363,7 @@ old_sound_rabbit_mq:
             queue_options:
                 name: 'wallabag.import.chrome'
             callback: wallabag_import.consumer.amqp.chrome
-            qos_options: {prefetch_count: 10}
+            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
 
 fos_js_routing:
     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:
     rabbitmq_port: 5672
     rabbitmq_user: guest
     rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10
 
     # Redis processing
     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
     rabbitmq_port: 5672
     rabbitmq_user: guest
     rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10 # lesen http://www.rabbitmq.com/consumer-prefetch.html
 
 RabbitMQ in wallabag aktivieren
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
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
     rabbitmq_port: 5672
     rabbitmq_user: guest
     rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10 # read http://www.rabbitmq.com/consumer-prefetch.html
 
 Enable RabbitMQ in wallabag
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
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
     rabbitmq_port: 5672
     rabbitmq_user: guest
     rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10 # lire http://www.rabbitmq.com/consumer-prefetch.html
 
 Activer RabbitMQ dans wallabag
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-- 
cgit v1.2.3