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 | |
| parent | d18e2bd59d3003e2ae38116688e350bfc2774ae7 (diff) | |
Gitlab_meta to 3.1. Added workaround for 500 Redis error until it will be fixed
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/dashboard_controller.rb | 9 | ||||
| -rw-r--r-- | app/views/admin/dashboard/index.html.haml | 24 |
2 files changed, 23 insertions, 10 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 diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 3e26f566a2e..b0b59a46fdb 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -4,13 +4,21 @@ %h5 Resque Workers .data.padded - = link_to admin_resque_path do - %h1{class: @workers.present? ? "cgreen" : "cred"} - = @workers.count - %hr - %p - %strong{class: @pending_jobs > 0 ? "cred" : "cgreen"} - #{@pending_jobs} post receive jobs waiting + - if @resque_accessible + = link_to admin_resque_path do + %h1{class: @workers.present? ? "cgreen" : "cred"} + = @workers.count + %hr + %p + %strong{class: @pending_jobs > 0 ? "cred" : "cgreen"} + #{@pending_jobs} post receive jobs waiting + - else + = link_to admin_resque_path do + %h1.cdark ? + %hr + %p + %strong Resque status unknown + .span4 .ui-box @@ -42,6 +50,6 @@ %hr - @users.each do |user| %p - = link_to [:admin, user] do + = link_to [:admin, user] do = user.name %small= user.email |