mirror of
https://github.com/wallabag/wallabag.git
synced 2025-07-17 17:08:37 +00:00
Display how many messages are queue
- update the docker-composer to add Redis - add migrations
This commit is contained in:
parent
5d002e9bdf
commit
e01a3c98d6
5 changed files with 118 additions and 0 deletions
|
@ -19,6 +19,8 @@
|
|||
Materialize.toast('{{ flashMessage|trans }}', 4000);
|
||||
</script>
|
||||
{% endfor %}
|
||||
|
||||
{{ render(controller("WallabagImportBundle:Import:checkQueue")) }}
|
||||
{% endblock %}
|
||||
|
||||
{% block menu %}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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 %}
|
Loading…
Add table
Add a link
Reference in a new issue