diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-09-19 07:15:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-19 07:15:40 +0200 |
commit | da18a4682f124b02278860d23ac1d59dee995277 (patch) | |
tree | eabbe9da7203eea41e0cb0ec3c26b9b6599cf58f /src/Wallabag/ImportBundle/Controller/ImportController.php | |
parent | 0ed8ce55b5caf2c88e8330afa83abef6c4aac9a4 (diff) | |
parent | 59b97fae996d8307b9d957d210d46200f6d206bf (diff) | |
download | wallabag-da18a4682f124b02278860d23ac1d59dee995277.tar.gz wallabag-da18a4682f124b02278860d23ac1d59dee995277.tar.zst wallabag-da18a4682f124b02278860d23ac1d59dee995277.zip |
Merge pull request #1941 from wallabag/v2-asynchronous-jobs
Use asynchronous jobs for imports
Diffstat (limited to 'src/Wallabag/ImportBundle/Controller/ImportController.php')
-rw-r--r-- | src/Wallabag/ImportBundle/Controller/ImportController.php | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/ImportController.php b/src/Wallabag/ImportBundle/Controller/ImportController.php index c1486e38..ea4f7d7b 100644 --- a/src/Wallabag/ImportBundle/Controller/ImportController.php +++ b/src/Wallabag/ImportBundle/Controller/ImportController.php | |||
@@ -16,4 +16,66 @@ class ImportController extends Controller | |||
16 | 'imports' => $this->get('wallabag_import.chain')->getAll(), | 16 | 'imports' => $this->get('wallabag_import.chain')->getAll(), |
17 | ]); | 17 | ]); |
18 | } | 18 | } |
19 | |||
20 | /** | ||
21 | * Display how many messages are queue (both in Redis and RabbitMQ). | ||
22 | * Only for admins. | ||
23 | */ | ||
24 | public function checkQueueAction() | ||
25 | { | ||
26 | $nbRedisMessages = null; | ||
27 | $nbRabbitMessages = null; | ||
28 | |||
29 | if (!$this->get('security.authorization_checker')->isGranted('ROLE_SUPER_ADMIN')) { | ||
30 | return $this->render('WallabagImportBundle:Import:check_queue.html.twig', [ | ||
31 | 'nbRedisMessages' => $nbRedisMessages, | ||
32 | 'nbRabbitMessages' => $nbRabbitMessages, | ||
33 | ]); | ||
34 | } | ||
35 | |||
36 | if ($this->get('craue_config')->get('import_with_rabbitmq')) { | ||
37 | $nbRabbitMessages = $this->getTotalMessageInRabbitQueue('pocket') | ||
38 | + $this->getTotalMessageInRabbitQueue('readability') | ||
39 | + $this->getTotalMessageInRabbitQueue('wallabag_v1') | ||
40 | + $this->getTotalMessageInRabbitQueue('wallabag_v2') | ||
41 | ; | ||
42 | } elseif ($this->get('craue_config')->get('import_with_redis')) { | ||
43 | $redis = $this->get('wallabag_core.redis.client'); | ||
44 | |||
45 | $nbRedisMessages = $redis->llen('wallabag.import.pocket') | ||
46 | + $redis->llen('wallabag.import.readability') | ||
47 | + $redis->llen('wallabag.import.wallabag_v1') | ||
48 | + $redis->llen('wallabag.import.wallabag_v2') | ||
49 | ; | ||
50 | } | ||
51 | |||
52 | return $this->render('WallabagImportBundle:Import:check_queue.html.twig', [ | ||
53 | 'nbRedisMessages' => $nbRedisMessages, | ||
54 | 'nbRabbitMessages' => $nbRabbitMessages, | ||
55 | ]); | ||
56 | } | ||
57 | |||
58 | /** | ||
59 | * Count message in RabbitMQ queue. | ||
60 | * It get one message without acking it (so it'll stay in the queue) | ||
61 | * which will include the total of *other* messages in the queue. | ||
62 | * Adding one to that messages will result in the full total message. | ||
63 | * | ||
64 | * @param string $importService The import service related: pocket, readability, wallabag_v1 or wallabag_v2 | ||
65 | * | ||
66 | * @return int | ||
67 | */ | ||
68 | private function getTotalMessageInRabbitQueue($importService) | ||
69 | { | ||
70 | $message = $this | ||
71 | ->get('old_sound_rabbit_mq.import_'.$importService.'_consumer') | ||
72 | ->getChannel() | ||
73 | ->basic_get('wallabag.import.'.$importService); | ||
74 | |||
75 | if (null === $message) { | ||
76 | return 0; | ||
77 | } | ||
78 | |||
79 | return $message->delivery_info['message_count'] + 1; | ||
80 | } | ||
19 | } | 81 | } |