From ad7341305c36e76ced23def5cf59c84082856a44 Mon Sep 17 00:00:00 2001 From: Torsten Zuehlsdorff Date: Tue, 21 Mar 2017 16:40:38 +0000 Subject: [PATCH] www/gitlab: fix wrong detection of running Sidekiq Sidekiq is detected as "not running" because when checking with "ps" it does not account for column truncation PR: 209487 Submitted by: Chris Stankevitz Reported by: otacilio.neto@bsd.com.br Reviewed by: Matthias Fechner --- www/gitlab/Makefile | 2 +- www/gitlab/files/patch-lib_tasks_gitlab_check.rake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 www/gitlab/files/patch-lib_tasks_gitlab_check.rake diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 52440518591e..1843cfb63931 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -4,7 +4,7 @@ PORTNAME= gitlab PORTVERSION= 8.14.9 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www devel MAINTAINER= tz@FreeBSD.org diff --git a/www/gitlab/files/patch-lib_tasks_gitlab_check.rake b/www/gitlab/files/patch-lib_tasks_gitlab_check.rake new file mode 100644 index 000000000000..89a814df822d --- /dev/null +++ b/www/gitlab/files/patch-lib_tasks_gitlab_check.rake @@ -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