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

Replace RabbitMQ injection with CraueConfiguration

Browse source
This commit is contained in:
Nicolas Lœuillet 2016-02-15 21:30:55 +01:00 • committed by Jeremy Benoist
parent e31ee20dd7
commit 40d2a29443
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
6 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Wallabag/CoreBundle/Command/InstallCommand.php
View file

@ -321,6 +321,11 @@ class InstallCommand extends ContainerAwareCommand
'value' => null,
'section' => 'import',
],
[
'name' => 'rabbitmq',
'value' => '0',
'section' => 'import',
],
[
'name' => 'show_printlink',
'value' => '1',

5
src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
View file

@ -95,6 +95,11 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
'value' => null,
'section' => 'import',
],
[
'name' => 'rabbitmq',
'value' => '0',
'section' => 'import',
],
[
'name' => 'show_printlink',
'value' => '1',

4
src/Wallabag/ImportBundle/Import/PocketImport.php
View file

@ -25,14 +25,14 @@ class PocketImport extends AbstractImport
private $producer;
private $rabbitMQ;
public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, Config $craueConfig, $rabbitMQ, Producer $producer)
public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, Config $craueConfig, Producer $producer)
{
$this->user = $tokenStorage->getToken()->getUser();
$this->em = $em;
$this->contentProxy = $contentProxy;
$this->consumerKey = $craueConfig->get('pocket_consumer_key');
$this->logger = new NullLogger();
$this->rabbitMQ = $rabbitMQ;
$this->rabbitMQ = $craueConfig->get('rabbitmq');
$this->producer = $producer;
}

1
src/Wallabag/ImportBundle/Resources/config/services.yml
View file

@ -25,7 +25,6 @@ services:
- "@doctrine.orm.entity_manager"
- "@wallabag_core.content_proxy"
- "@craue_config"
- %rabbitmq%
- "@old_sound_rabbit_mq.wallabag_producer"
calls:
- [ setClient, [ "@wallabag_import.pocket.client" ] ]