diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-09 21:02:03 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-11 21:58:56 +0200 |
commit | b3437d58ae224121375c99e9288d8b808524e624 (patch) | |
tree | 94ce3446aed4396ba9304b8c97e421eba35e4edf /app/config | |
parent | 7f7531171f6e49110b5842f869e37c766a682473 (diff) | |
download | wallabag-b3437d58ae224121375c99e9288d8b808524e624.tar.gz wallabag-b3437d58ae224121375c99e9288d8b808524e624.tar.zst wallabag-b3437d58ae224121375c99e9288d8b808524e624.zip |
Enable Redis async import
- using javibravo/simpleue
- internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear
- if both option are enable rabbit will be choosen
- services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml`
-
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/config.yml | 8 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index d39bef95..e18a932d 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -254,7 +254,7 @@ old_sound_rabbit_mq: | |||
254 | type: topic | 254 | type: topic |
255 | queue_options: | 255 | queue_options: |
256 | name: 'wallabag.import.pocket' | 256 | name: 'wallabag.import.pocket' |
257 | callback: wallabag_import.consumer.pocket | 257 | callback: wallabag_import.consumer.ampq.pocket |
258 | import_readability: | 258 | import_readability: |
259 | connection: default | 259 | connection: default |
260 | exchange_options: | 260 | exchange_options: |
@@ -262,7 +262,7 @@ old_sound_rabbit_mq: | |||
262 | type: topic | 262 | type: topic |
263 | queue_options: | 263 | queue_options: |
264 | name: 'wallabag.import.readability' | 264 | name: 'wallabag.import.readability' |
265 | callback: wallabag_import.consumer.readability | 265 | callback: wallabag_import.consumer.ampq.readability |
266 | import_wallabag_v1: | 266 | import_wallabag_v1: |
267 | connection: default | 267 | connection: default |
268 | exchange_options: | 268 | exchange_options: |
@@ -270,7 +270,7 @@ old_sound_rabbit_mq: | |||
270 | type: topic | 270 | type: topic |
271 | queue_options: | 271 | queue_options: |
272 | name: 'wallabag.import.wallabag_v1' | 272 | name: 'wallabag.import.wallabag_v1' |
273 | callback: wallabag_import.consumer.wallabag_v1 | 273 | callback: wallabag_import.consumer.ampq.wallabag_v1 |
274 | import_wallabag_v2: | 274 | import_wallabag_v2: |
275 | connection: default | 275 | connection: default |
276 | exchange_options: | 276 | exchange_options: |
@@ -278,4 +278,4 @@ old_sound_rabbit_mq: | |||
278 | type: topic | 278 | type: topic |
279 | queue_options: | 279 | queue_options: |
280 | name: 'wallabag.import.wallabag_v2' | 280 | name: 'wallabag.import.wallabag_v2' |
281 | callback: wallabag_import.consumer.wallabag_v2 | 281 | callback: wallabag_import.consumer.ampq.wallabag_v2 |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index a59dc02c..f2e5bec3 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -46,3 +46,7 @@ parameters: | |||
46 | rabbitmq_port: 5672 | 46 | rabbitmq_port: 5672 |
47 | rabbitmq_user: guest | 47 | rabbitmq_user: guest |
48 | rabbitmq_password: guest | 48 | rabbitmq_password: guest |
49 | |||
50 | # Redis processing | ||
51 | redis_host: localhost | ||
52 | redis_port: 6379 | ||