oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Display a message when async import won’t work

Browse source 
Mostly if Redis or RabbitMQ isn’t installed / launched.
I guess it’ll avoid some issues.
This commit is contained in:
Jeremy Benoist 2016-09-24 19:56:15 +02:00
parent e10f3b1e91
commit 13a522dfbd
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
13 changed files with 69 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/Wallabag/ImportBundle/Controller/ImportController.php
View file

@ -25,33 +25,41 @@ class ImportController extends Controller
{
$nbRedisMessages = null;
$nbRabbitMessages = null;
$redisNotInstalled = false;
$rabbitNotInstalled = false;
if (!$this->get('security.authorization_checker')->isGranted('ROLE_SUPER_ADMIN')) {
return $this->render('WallabagImportBundle:Import:check_queue.html.twig', [
'nbRedisMessages' => $nbRedisMessages,
'nbRabbitMessages' => $nbRabbitMessages,
]);
return $this->render('WallabagImportBundle:Import:check_queue.html.twig');
}
if ($this->get('craue_config')->get('import_with_rabbitmq')) {
$nbRabbitMessages = $this->getTotalMessageInRabbitQueue('pocket')
+ $this->getTotalMessageInRabbitQueue('readability')
+ $this->getTotalMessageInRabbitQueue('wallabag_v1')
+ $this->getTotalMessageInRabbitQueue('wallabag_v2')
;
// in case rabbit is activated but not installed
try {
$nbRabbitMessages = $this->getTotalMessageInRabbitQueue('pocket')
+ $this->getTotalMessageInRabbitQueue('readability')
+ $this->getTotalMessageInRabbitQueue('wallabag_v1')
+ $this->getTotalMessageInRabbitQueue('wallabag_v2');
} catch (\Exception $e) {
$rabbitNotInstalled = true;
}
} 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')
;
try {
$nbRedisMessages = $redis->llen('wallabag.import.pocket')
+ $redis->llen('wallabag.import.readability')
+ $redis->llen('wallabag.import.wallabag_v1')
+ $redis->llen('wallabag.import.wallabag_v2');
} catch (\Exception $e) {
$redisNotInstalled = true;
}
}
return $this->render('WallabagImportBundle:Import:check_queue.html.twig', [
'nbRedisMessages' => $nbRedisMessages,
'nbRabbitMessages' => $nbRabbitMessages,
'redisNotInstalled' => $redisNotInstalled,
'rabbitNotInstalled' => $rabbitNotInstalled,
]);
}

16
src/Wallabag/ImportBundle/Resources/views/Import/check_queue.html.twig
View file

@ -1,11 +1,23 @@
{% if nbRedisMessages > 0 %}
{% if nbRedisMessages is defined and nbRedisMessages > 0 %}
<script>
Materialize.toast('Messages in queue: {{ nbRedisMessages }}', 4000);
</script>
{% endif %}
{% if nbRabbitMessages > 0 %}
{% if nbRabbitMessages is defined and nbRabbitMessages > 0 %}
<script>
Materialize.toast('Messages in queue: {{ nbRabbitMessages }}', 4000);
</script>
{% endif %}
{% if redisNotInstalled is defined and redisNotInstalled %}
<div class="card-panel red darken-1 white-text">
{{ 'flashes.import.error.redis_enabled_not_installed'|trans|raw }}
</div>
{% endif %}
{% if rabbitNotInstalled is defined and rabbitNotInstalled %}
<div class="card-panel red darken-1 white-text">
{{ 'flashes.import.error.rabbit_enabled_not_installed'|trans|raw }}
</div>
{% endif %}