瀏覽代碼

Fix pagination and gracefully fallback if redis is not running

Jordi Boggiano 12 年之前
父節點
當前提交
dda2196d42
共有 2 個文件被更改,包括 11 次插入2 次删除
  1. 11 0
      src/Packagist/WebBundle/Controller/UserController.php
  2. 0 2
      src/Packagist/WebBundle/Package/Dumper.php

+ 11 - 0
src/Packagist/WebBundle/Controller/UserController.php

@@ -79,6 +79,17 @@ class UserController extends Controller
             new RedisAdapter($this->get('packagist.favorite_manager'), $user, 'getFavorites', 'getFavoriteCount')
         );
 
+        $paginator->setMaxPerPage(15);
+        $paginator->setCurrentPage($req->query->get('page', 1), false, true);
+
+        try {
+            $this->get('snc_redis.default')->connect();
+        } catch (\Exception $e) {
+            $this->get('session')->getFlashBag()->set('error', 'Could not connect to the Redis database.');
+
+            return array('user' => $user, 'packages' => array());
+        }
+
         return array('packages' => $paginator, 'user' => $user);
     }
 

+ 0 - 2
src/Packagist/WebBundle/Package/Dumper.php

@@ -417,8 +417,6 @@ class Dumper
 
     private function getTargetListing($file)
     {
-        $distribution = 8;
-
         $mtime = filemtime($file);
         $now = time();