X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FImportBundle%2FController%2FImportController.php;h=15de75ffdc824160c5cda2c4298a0b71194ab35c;hb=8eeefc658c500c0839512ac2e259e194ab943d2c;hp=ea4f7d7bb5acc0317367d378b9e441ec623a721e;hpb=4fc998245c56ad95c1e753ab52b0c702d4a8a59d;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/ImportBundle/Controller/ImportController.php b/src/Wallabag/ImportBundle/Controller/ImportController.php
index ea4f7d7b..15de75ff 100644
--- a/src/Wallabag/ImportBundle/Controller/ImportController.php
+++ b/src/Wallabag/ImportBundle/Controller/ImportController.php
@@ -25,33 +25,49 @@ 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')
+                    + $this->getTotalMessageInRabbitQueue('firefox')
+                    + $this->getTotalMessageInRabbitQueue('chrome')
+                    + $this->getTotalMessageInRabbitQueue('instapaper')
+                ;
+            } 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')
+                    + $redis->llen('wallabag.import.firefox')
+                    + $redis->llen('wallabag.import.chrome')
+                    + $redis->llen('wallabag.import.instapaper')
+                ;
+            } catch (\Exception $e) {
+                $redisNotInstalled = true;
+            }
         }
 
         return $this->render('WallabagImportBundle:Import:check_queue.html.twig', [
             'nbRedisMessages' => $nbRedisMessages,
             'nbRabbitMessages' => $nbRabbitMessages,
+            'redisNotInstalled' => $redisNotInstalled,
+            'rabbitNotInstalled' => $rabbitNotInstalled,
         ]);
     }