From e01a3c98d6908e95121b5ade0161f40af1b05ca6 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 13 Sep 2016 20:31:32 +0200
Subject: Display how many messages are queue
- update the docker-composer to add Redis
- add migrations
---
.../views/themes/material/layout.html.twig | 2 +
.../ImportBundle/Controller/ImportController.php | 54 ++++++++++++++++++++++
.../Resources/views/Import/check_queue.html.twig | 11 +++++
3 files changed, 67 insertions(+)
create mode 100644 src/Wallabag/ImportBundle/Resources/views/Import/check_queue.html.twig
(limited to 'src')
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index b70198da..23938b21 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -19,6 +19,8 @@
Materialize.toast('{{ flashMessage|trans }}', 4000);
</script>
{% endfor %}
+
+ {{ render(controller("WallabagImportBundle:Import:checkQueue")) }}
{% endblock %}
{% block menu %}
diff --git a/src/Wallabag/ImportBundle/Controller/ImportController.php b/src/Wallabag/ImportBundle/Controller/ImportController.php
index c1486e38..d670746c 100644
--- a/src/Wallabag/ImportBundle/Controller/ImportController.php
+++ b/src/Wallabag/ImportBundle/Controller/ImportController.php
@@ -16,4 +16,58 @@ class ImportController extends Controller
'imports' => $this->get('wallabag_import.chain')->getAll(),
]);
}
+
+ /**
+ * Display how many messages are queue (both in Redis and RabbitMQ).
+ */
+ public function checkQueueAction()
+ {
+ $nbRedisMessages = null;
+ $nbRabbitMessages = null;
+
+ if ($this->get('craue_config')->get('import_with_rabbitmq')) {
+ $nbRabbitMessages = $this->getTotalMessageInRabbitQueue('pocket')
+ + $this->getTotalMessageInRabbitQueue('readability')
+ + $this->getTotalMessageInRabbitQueue('wallabag_v1')
+ + $this->getTotalMessageInRabbitQueue('wallabag_v2')
+ ;
+ } elseif ($this->get('craue_config')->get('import_with_redis')) {
+ $redis = $this->get('wallabag_core.redis.client');
+
+ $nbRedisMessages = $redis->llen('wallabag.import.pocket')
+ + $redis->llen('wallabag.import.readability')
+ + $redis->llen('wallabag.import.wallabag_v1')
+ + $redis->llen('wallabag.import.wallabag_v2')
+ ;
+ }
+
+ return $this->render('WallabagImportBundle:Import:check_queue.html.twig', [
+ 'nbRedisMessages' => $nbRedisMessages,
+ 'nbRabbitMessages' => $nbRabbitMessages,
+ ]);
+ }
+
+ /**
+ * Count message in RabbitMQ queue.
+ * It get one message without acking it (so it'll stay in the queue)
+ * which will include the total of *other* messages in the queue.
+ * Adding one to that messages will result in the full total message.
+ *
+ * @param string $importService The import service related: pocket, readability, wallabag_v1 or wallabag_v2
+ *
+ * @return int
+ */
+ private function getTotalMessageInRabbitQueue($importService)
+ {
+ $message = $this
+ ->get('old_sound_rabbit_mq.import_'.$importService.'_consumer')
+ ->getChannel()
+ ->basic_get('wallabag.import.'.$importService);
+
+ if (null === $message) {
+ return 0;
+ }
+
+ return $message->delivery_info['message_count'] + 1;
+ }
}
diff --git a/src/Wallabag/ImportBundle/Resources/views/Import/check_queue.html.twig b/src/Wallabag/ImportBundle/Resources/views/Import/check_queue.html.twig
new file mode 100644
index 00000000..7168ea35
--- /dev/null
+++ b/src/Wallabag/ImportBundle/Resources/views/Import/check_queue.html.twig
@@ -0,0 +1,11 @@
+{% if nbRedisMessages > 0 %}
+ <script>
+ Materialize.toast('Messages in queue: {{ nbRedisMessages }}', 4000);
+ </script>
+{% endif %}
+
+{% if nbRabbitMessages > 0 %}
+ <script>
+ Materialize.toast('Messages in queue: {{ nbRabbitMessages }}', 4000);
+ </script>
+{% endif %}
--
cgit v1.2.3