Send every imported item to the queue

Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format.
Then, the worker retrieve that information, find / create the entry and save it.

2 files changed, 11 insertions, 15 deletions

diff --git a/app/config/config.yml b/app/config/config.yml
index ef5ae0aa..fa829637 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -219,24 +219,24 @@ lexik_maintenance:
 old_sound_rabbit_mq:
     connections:
         default:
-            host:     %rabbitmq_host%
-            port:     %rabbitmq_port%
-            user:     %rabbitmq_user%
-            password: %rabbitmq_password%
+            host:     "%rabbitmq_host%"
+            port:     "%rabbitmq_port%"
+            user:     "%rabbitmq_user%"
+            password: "%rabbitmq_password%"
             vhost:    /
-            lazy:     false
+            lazy:     true
     producers:
-        wallabag:
+        wallabag_pocket:
             connection: default
             exchange_options:
-                name: 'wallabag_exchange'
+                name: 'wallabag.import.pocket'
                 type: topic
     consumers:
-        entries:
+        wallabag_pocket:
             connection: default
             exchange_options:
-                name: 'wallabag_exchange'
+                name: 'wallabag.import.pocket'
                 type: topic
             queue_options:
-                name: 'wallabag_queue'
-            callback: wallabag_import.consumer.entry
+                name: 'wallabag.import.pocket'
+            callback: wallabag_import.consumer.pocket
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index e925b412..a59dc02c 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -41,11 +41,7 @@ parameters:
 
     rss_limit: 50
 
-    # pocket import
-    pocket_consumer_key: xxxxxxxx
-
     # RabbitMQ processing
-    rabbitmq: false
     rabbitmq_host: localhost
     rabbitmq_port: 5672
     rabbitmq_user: guest