svn commit: r436617 - in head/www/gitlab: . files

[Torsten Zuehlsdorff]

Author: tz
Date: Tue Mar 21 16:40:38 2017
New Revision: 436617
URL: https://svnweb.freebsd.org/changeset/ports/436617

Log:
  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 <chris-freebsd-bugs at stankevitz.com>
  Reported by:  otacilio.neto at bsd.com.br
  Reviewed by:  Matthias Fechner <idefix at fechner.net>

Added:
  head/www/gitlab/files/patch-lib_tasks_gitlab_check.rake   (contents, props changed)
Modified:
  head/www/gitlab/Makefile

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Tue Mar 21 16:38:33 2017	(r436616)
+++ head/www/gitlab/Makefile	Tue Mar 21 16:40:38 2017	(r436617)
@@ -4,7 +4,7 @@
 PORTNAME=	gitlab
 PORTVERSION=	8.14.9
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www devel
 
 MAINTAINER=	tz at FreeBSD.org

Added: head/www/gitlab/files/patch-lib_tasks_gitlab_check.rake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/gitlab/files/patch-lib_tasks_gitlab_check.rake	Tue Mar 21 16:40:38 2017	(r436617)
@@ -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