1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00

Merge remote-tracking branch 'origin/2.6' into port/2.6.10

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
Kevin Decherf 2024-11-11 09:25:31 +01:00
commit 1d661e8c68
46 changed files with 1306 additions and 375 deletions

View file

@ -277,6 +277,11 @@ old_sound_rabbit_mq:
exchange_options:
name: 'wallabag.import.elcurator'
type: topic
import_omnivore:
connection: default
exchange_options:
name: 'wallabag.import.omnivore'
type: topic
import_firefox:
connection: default
exchange_options:
@ -370,6 +375,15 @@ old_sound_rabbit_mq:
name: 'wallabag.import.elcurator'
callback: wallabag.consumer.amqp.elcurator
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_omnivore:
connection: default
exchange_options:
name: 'wallabag.import.omnivore'
type: topic
queue_options:
name: 'wallabag.import.omnivore'
callback: wallabag.consumer.amqp.omnivore
qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
import_firefox:
connection: default
exchange_options:

View file

@ -58,6 +58,11 @@ services:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_elcurator_producer'
$redisProducer: '@wallabag.producer.redis.elcurator'
Wallabag\Controller\Import\OmnivoreController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_omnivore_producer'
$redisProducer: '@wallabag.producer.redis.omnivore'
Wallabag\Controller\Import\FirefoxController:
arguments:
$rabbitMqProducer: '@old_sound_rabbit_mq.import_firefox_producer'
@ -324,6 +329,10 @@ services:
tags:
- { name: wallabag.import, alias: delicious }
Wallabag\Import\OmnivoreImport:
tags:
- { name: wallabag.import, alias: omnivore }
Wallabag\Import\FirefoxImport:
tags:
- { name: wallabag.import, alias: firefox }

View file

@ -19,6 +19,7 @@ services:
$elcuratorConsumer: '@old_sound_rabbit_mq.import_elcurator_consumer'
$shaarliConsumer: '@old_sound_rabbit_mq.import_shaarli_consumer'
$pocketHtmlConsumer: '@old_sound_rabbit_mq.import_pocket_html_consumer'
$omnivoreConsumer: '@old_sound_rabbit_mq.import_omnivore_consumer'
wallabag.consumer.amqp.pocket:
class: Wallabag\Consumer\AMQPEntryConsumer
@ -45,6 +46,11 @@ services:
arguments:
$import: '@Wallabag\Import\DeliciousImport'
wallabag.consumer.amqp.omnivore:
class: Wallabag\Consumer\AMQPEntryConsumer
arguments:
$import: '@Wallabag\Import\OmnivoreImport'
wallabag.consumer.amqp.wallabag_v1:
class: Wallabag\Consumer\AMQPEntryConsumer
arguments:

View file

@ -69,6 +69,22 @@ services:
arguments:
$import: '@Wallabag\Import\DeliciousImport'
# Omnivore
wallabag.queue.redis.omnivore:
class: Simpleue\Queue\RedisQueue
arguments:
$queueName: "wallabag.import.omnivore"
wallabag.producer.redis.omnivore:
class: Wallabag\Redis\Producer
arguments:
- "@wallabag.queue.redis.omnivore"
wallabag.consumer.redis.omnivore:
class: Wallabag\Consumer\RedisEntryConsumer
arguments:
$import: '@Wallabag\Import\OmnivoreImport'
# pocket
wallabag.queue.redis.pocket:
class: Simpleue\Queue\RedisQueue

View file

@ -1,5 +1,5 @@
parameters:
wallabag.version: 2.6.8
wallabag.version: 2.6.10
wallabag.paypal_url: "https://liberapay.com/wallabag/donate"
wallabag.languages:
en: 'English'