Gitlab_meta to 3.1. Added workaround for 500 Redis error until it will be fixed

Dmitriy Zaporozhets
1 parent d18e2bd5
Showing 4 changed files with 26 additions and 13 deletions Show diff stats
Gemfile
Gemfile.lock
app/controllers/admin/dashboard_controller.rb
app/views/admin/dashboard/index.html.haml
@@ -152,5 +152,5 @@ group :test do
 end
  
 group :production do
-  gem "gitlab_meta", '3.0'
+  gem "gitlab_meta", '3.1'
 end
@@ -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)
 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
...	...	@@ -152,5 +152,5 @@ group :test do
152	152	end
153	153
154	154	group :production do
155		- gem "gitlab_meta", '3.0'
	155	+ gem "gitlab_meta", '3.1'
156	156	end
...	...
...	...	@@ -171,7 +171,7 @@ GEM
171	171	mime-types (~> 1.19)
172	172	pygments.rb (>= 0.2.13)
173	173	github-markup (0.7.4)
174		- gitlab_meta (3.0)
	174	+ gitlab_meta (3.1)
175	175	gitolite (1.1.0)
176	176	gratr19 (~> 0.4.4.1)
177	177	grit (~> 2.5.0)
...	...	@@ -465,7 +465,7 @@ DEPENDENCIES
465	465	git
466	466	github-linguist (~> 2.3.4)
467	467	github-markup (~> 0.7.4)
468		- gitlab_meta (= 3.0)
	468	+ gitlab_meta (= 3.1)
469	469	gitolite (= 1.1.0)
470	470	grack!
471	471	grape (~> 0.2.1)
...	...
1	1	class Admin::DashboardController < AdminController
2	2	def index
3		- @workers = Resque.workers
4		- @pending_jobs = Resque.size(:post_receive)
5	3	@projects = Project.order("created_at DESC").limit(10)
6	4	@users = User.order("created_at DESC").limit(10)
	5	+
	6	+ @resque_accessible = true
	7	+ @workers = Resque.workers
	8	+ @pending_jobs = Resque.size(:post_receive)
	9	+
	10	+ rescue Redis::InheritedError
	11	+ @resque_accessible = false
7	12	end
8	13	end
...	...
...	...	@@ -4,13 +4,21 @@
4	4	%h5
5	5	Resque Workers
6	6	.data.padded
7		- = link_to admin_resque_path do
8		- %h1{class: @workers.present? ? "cgreen" : "cred"}
9		- = @workers.count
10		- %hr
11		- %p
12		- %strong{class: @pending_jobs > 0 ? "cred" : "cgreen"}
13		- #{@pending_jobs} post receive jobs waiting
	7	+ - if @resque_accessible
	8	+ = link_to admin_resque_path do
	9	+ %h1{class: @workers.present? ? "cgreen" : "cred"}
	10	+ = @workers.count
	11	+ %hr
	12	+ %p
	13	+ %strong{class: @pending_jobs > 0 ? "cred" : "cgreen"}
	14	+ #{@pending_jobs} post receive jobs waiting
	15	+ - else
	16	+ = link_to admin_resque_path do
	17	+ %h1.cdark ?
	18	+ %hr
	19	+ %p
	20	+ %strong Resque status unknown
	21	+
14	22
15	23	.span4
16	24	.ui-box
...	...	@@ -42,6 +50,6 @@
42	50	%hr
43	51	- @users.each do \|user\|
44	52	%p
45		- = link_to [:admin, user] do
	53	+ = link_to [:admin, user] do
46	54	= user.name
47	55	%small= user.email
...	...