aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-11-19 13:53:13 +0100
committerGitHub <noreply@github.com>2017-11-19 13:53:13 +0100
commite585dde46c4ed9e0223925968f1634e81c15c67f (patch)
tree20009c0924d50f81c8712bbec06cfccd7cd2df09
parentf6988b5aa3c468f8cb3430a190673d45c9c13782 (diff)
parentc8ac32cf171b60e8e496bbaf781cbf309bd1e04c (diff)
downloadwallabag-e585dde46c4ed9e0223925968f1634e81c15c67f.tar.gz
wallabag-e585dde46c4ed9e0223925968f1634e81c15c67f.tar.zst
wallabag-e585dde46c4ed9e0223925968f1634e81c15c67f.zip
Merge pull request #3422 from wallabag/simpleue-2
Jump to Simpleue 2.0
-rw-r--r--composer.json2
-rw-r--r--src/Wallabag/ImportBundle/Consumer/RedisEntryConsumer.php17
2 files changed, 18 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index d1f970c7..ae7108f0 100644
--- a/composer.json
+++ b/composer.json
@@ -80,7 +80,7 @@
80 "white-october/pagerfanta-bundle": "^1.0", 80 "white-october/pagerfanta-bundle": "^1.0",
81 "php-amqplib/rabbitmq-bundle": "^1.8", 81 "php-amqplib/rabbitmq-bundle": "^1.8",
82 "predis/predis": "^1.0", 82 "predis/predis": "^1.0",
83 "javibravo/simpleue": "^1.0", 83 "javibravo/simpleue": "^2.0",
84 "symfony/dom-crawler": "^3.1", 84 "symfony/dom-crawler": "^3.1",
85 "friendsofsymfony/jsrouting-bundle": "^1.6", 85 "friendsofsymfony/jsrouting-bundle": "^1.6",
86 "bdunogier/guzzle-site-authenticator": "^1.0.0@dev", 86 "bdunogier/guzzle-site-authenticator": "^1.0.0@dev",
diff --git a/src/Wallabag/ImportBundle/Consumer/RedisEntryConsumer.php b/src/Wallabag/ImportBundle/Consumer/RedisEntryConsumer.php
index 450b71ff..862d0c43 100644
--- a/src/Wallabag/ImportBundle/Consumer/RedisEntryConsumer.php
+++ b/src/Wallabag/ImportBundle/Consumer/RedisEntryConsumer.php
@@ -21,9 +21,26 @@ class RedisEntryConsumer extends AbstractConsumer implements Job
21 /** 21 /**
22 * Should tell if the given job will kill the worker. 22 * Should tell if the given job will kill the worker.
23 * We don't want to stop it :). 23 * We don't want to stop it :).
24 *
25 * @param string $job Content of the message (directly from Redis)
26 *
27 * @return false
24 */ 28 */
25 public function isStopJob($job) 29 public function isStopJob($job)
26 { 30 {
27 return false; 31 return false;
28 } 32 }
33
34 /**
35 * This abstract method is only used when we use one queue for multiple job type.
36 * We don't do that, so we'll always return true.
37 *
38 * @param string $job Content of the message (directly from Redis)
39 *
40 * @return true
41 */
42 public function isMyJob($job)
43 {
44 return true;
45 }
29} 46}