diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-21 14:45:15 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-21 14:45:15 +0400 |
| commit | 898d09a21ef3bf937d0b9379dd13c917b553e859 (patch) | |
| tree | 437854e16263a4f167acb18077b30ffbf2db0eee /app/controllers/admin/dashboard_controller.rb | |
| parent | d18e2bd59d3003e2ae38116688e350bfc2774ae7 (diff) | |
Gitlab_meta to 3.1. Added workaround for 500 Redis error until it will be fixed
Diffstat (limited to 'app/controllers/admin/dashboard_controller.rb')
| -rw-r--r-- | app/controllers/admin/dashboard_controller.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb index 5152f6fa83d..827dd0cf7cd 100644 --- a/app/controllers/admin/dashboard_controller.rb +++ b/app/controllers/admin/dashboard_controller.rb @@ -1,8 +1,13 @@ class Admin::DashboardController < AdminController def index - @workers = Resque.workers - @pending_jobs = Resque.size(:post_receive) @projects = Project.order("created_at DESC").limit(10) @users = User.order("created_at DESC").limit(10) + + @resque_accessible = true + @workers = Resque.workers + @pending_jobs = Resque.size(:post_receive) + + rescue Redis::InheritedError + @resque_accessible = false end end |