Permalink
Browse files

Gitlab_meta to 3.1. Added workaround for 500 Redis error until it wil…

…l be fixed
  • Loading branch information...
dzaporozhets committed Nov 21, 2012
1 parent d18e2bd commit 898d09a21ef3bf937d0b9379dd13c917b553e859
Showing with 26 additions and 13 deletions.
  1. +1 −1 Gemfile
  2. +2 −2 Gemfile.lock
  3. +7 −2 app/controllers/admin/dashboard_controller.rb
  4. +16 −8 app/views/admin/dashboard/index.html.haml
View
@@ -152,5 +152,5 @@ group :test do
end
group :production do
- gem "gitlab_meta", '3.0'
+ gem "gitlab_meta", '3.1'
end
View
@@ -171,7 +171,7 @@ GEM
mime-types (~> 1.19)
pygments.rb (>= 0.2.13)
github-markup (0.7.4)
- gitlab_meta (3.0)
+ gitlab_meta (3.1)
gitolite (1.1.0)
gratr19 (~> 0.4.4.1)
grit (~> 2.5.0)
@@ -465,7 +465,7 @@ DEPENDENCIES
git
github-linguist (~> 2.3.4)
github-markup (~> 0.7.4)
- gitlab_meta (= 3.0)
+ gitlab_meta (= 3.1)
gitolite (= 1.1.0)
grack!
grape (~> 0.2.1)
@@ -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
@@ -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

0 comments on commit 898d09a

Please sign in to comment.