From: Jeremy Benoist Date: Sun, 18 Dec 2016 19:32:35 +0000 (+0100) Subject: Merge pull request #2682 from wallabag/migration-config X-Git-Tag: 2.2.0~3^2~22 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=77e342f75d9c8da453a077bb826e722768389dcd;hp=bea8d754171321fa6960ae8916da2a37667e7705;p=github%2Fwallabag%2Fwallabag.git Merge pull request #2682 from wallabag/migration-config Ensure craue_config_setting migration are ok --- diff --git a/app/config/config.yml b/app/config/config.yml index d52f37c8..591b5294 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -300,6 +300,7 @@ old_sound_rabbit_mq: queue_options: name: 'wallabag.import.pocket' callback: wallabag_import.consumer.amqp.pocket + qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_readability: connection: default exchange_options: @@ -308,6 +309,7 @@ old_sound_rabbit_mq: queue_options: name: 'wallabag.import.readability' callback: wallabag_import.consumer.amqp.readability + qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_instapaper: connection: default exchange_options: @@ -316,6 +318,7 @@ old_sound_rabbit_mq: queue_options: name: 'wallabag.import.instapaper' callback: wallabag_import.consumer.amqp.instapaper + qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_pinboard: connection: default exchange_options: @@ -324,6 +327,7 @@ old_sound_rabbit_mq: queue_options: name: 'wallabag.import.pinboard' callback: wallabag_import.consumer.amqp.pinboard + qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_wallabag_v1: connection: default exchange_options: @@ -332,6 +336,7 @@ old_sound_rabbit_mq: queue_options: name: 'wallabag.import.wallabag_v1' callback: wallabag_import.consumer.amqp.wallabag_v1 + qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_wallabag_v2: connection: default exchange_options: @@ -340,6 +345,7 @@ old_sound_rabbit_mq: queue_options: name: 'wallabag.import.wallabag_v2' callback: wallabag_import.consumer.amqp.wallabag_v2 + qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_firefox: connection: default exchange_options: @@ -348,6 +354,7 @@ old_sound_rabbit_mq: queue_options: name: 'wallabag.import.firefox' callback: wallabag_import.consumer.amqp.firefox + qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"} import_chrome: connection: default exchange_options: @@ -356,6 +363,7 @@ old_sound_rabbit_mq: queue_options: name: 'wallabag.import.chrome' callback: wallabag_import.consumer.amqp.chrome + 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 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index ff6f564e..b03f49ed 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -319,7 +319,7 @@ class EntryController extends Controller $this->get('lexik_form_filter.query_builder_updater')->addFilterConditions($form, $qb); } - $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); + $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false); $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries') ->prepare($pagerAdapter, $page); diff --git a/src/Wallabag/CoreBundle/Controller/RssController.php b/src/Wallabag/CoreBundle/Controller/RssController.php index 2290386f..92f18707 100644 --- a/src/Wallabag/CoreBundle/Controller/RssController.php +++ b/src/Wallabag/CoreBundle/Controller/RssController.php @@ -85,7 +85,7 @@ class RssController extends Controller throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type)); } - $pagerAdapter = new DoctrineORMAdapter($qb->getQuery()); + $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false); $entries = new Pagerfanta($pagerAdapter); $perPage = $user->getConfig()->getRssLimit() ?: $this->getParameter('wallabag_core.rss_limit'); diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 553ad6ab..b9532fa2 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php @@ -125,9 +125,7 @@ class EntryRepository extends EntityRepository { return $this ->getBuilderByUser($userId) - ->leftJoin('e.tags', 't') - ->groupBy('e.id') - ->having('count(t.id) = 0'); + ->andWhere('size(e.tags) = 0'); } /** @@ -173,7 +171,7 @@ class EntryRepository extends EntityRepository $qb->orderBy('e.updatedAt', $order); } - $pagerAdapter = new DoctrineORMAdapter($qb); + $pagerAdapter = new DoctrineORMAdapter($qb, true, false); return new Pagerfanta($pagerAdapter); }