kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

www/gitlab: fix wrong detection of running Sidekiq

Browse source 
Sidekiq is detected as "not running" because when checking with "ps" it
does not account for column truncation

PR:           209487
Submitted by: Chris Stankevitz <chris-freebsd-bugs@stankevitz.com>
Reported by:  otacilio.neto@bsd.com.br
Reviewed by:  Matthias Fechner <idefix@fechner.net>
This commit is contained in:
Torsten Zuehlsdorff 2017-03-21 16:40:38 +00:00
parent 141e3d8b59
commit ad7341305c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=436617
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/gitlab/Makefile
View file

@ -4,7 +4,7 @@
PORTNAME= gitlab
PORTVERSION= 8.14.9
DISTVERSIONPREFIX= v
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= www devel
MAINTAINER= tz@FreeBSD.org

11
www/gitlab/files/patch-lib_tasks_gitlab_check.rake Normal file
View file

@ -0,0 +1,11 @@
--- lib/tasks/gitlab/check.rake.orig 2017-03-21 16:35:39 UTC
+++ lib/tasks/gitlab/check.rake
@@ -621,7 +621,7 @@ namespace :gitlab do
end
def sidekiq_process_count
- ps_ux, _ = Gitlab::Popen.popen(%W(ps ux))
+ ps_ux, _ = Gitlab::Popen.popen(%W(ps wux))
ps_ux.scan(/sidekiq \d+\.\d+\.\d+/).count
end
end