From owner-svn-ports-all@freebsd.org Thu Jun 7 13:09:42 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D0381FE6F89; Thu, 7 Jun 2018 13:09:41 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7FE568F97A; Thu, 7 Jun 2018 13:09:41 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 60F07207F1; Thu, 7 Jun 2018 13:09:41 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w57D9fbW021126; Thu, 7 Jun 2018 13:09:41 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w57D9e3W021125; Thu, 7 Jun 2018 13:09:40 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201806071309.w57D9e3W021125@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Thu, 7 Jun 2018 13:09:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471915 - in head/net-mgmt/grok_exporter: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/net-mgmt/grok_exporter: . files X-SVN-Commit-Revision: 471915 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jun 2018 13:09:42 -0000 Author: swills Date: Thu Jun 7 13:09:40 2018 New Revision: 471915 URL: https://svnweb.freebsd.org/changeset/ports/471915 Log: net-mgmt/grok_exporter: Fix rc startup script when booting PR: 228759 Submitted by: Gasol Wu (maintainer) Modified: head/net-mgmt/grok_exporter/Makefile (contents, props changed) head/net-mgmt/grok_exporter/files/grok_exporter.in Modified: head/net-mgmt/grok_exporter/Makefile ============================================================================== --- head/net-mgmt/grok_exporter/Makefile Thu Jun 7 13:00:19 2018 (r471914) +++ head/net-mgmt/grok_exporter/Makefile Thu Jun 7 13:09:40 2018 (r471915) @@ -3,7 +3,7 @@ PORTNAME= grok_exporter PORTVERSION= 0.2.3 DISTVERSIONPREFIX=v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MAINTAINER= gasol.wu@gmail.com Modified: head/net-mgmt/grok_exporter/files/grok_exporter.in ============================================================================== --- head/net-mgmt/grok_exporter/files/grok_exporter.in Thu Jun 7 13:00:19 2018 (r471914) +++ head/net-mgmt/grok_exporter/files/grok_exporter.in Thu Jun 7 13:09:40 2018 (r471915) @@ -16,6 +16,8 @@ # Default is "prometheus". # grok_exporter_group (string): Set group that grok_exporter will run under # Default is "prometheus". +# grok_exporter_log_file (string): Set file that grok_exporter will log to +# Default is "/var/log/grok_exporter.log". . /etc/rc.subr @@ -29,16 +31,20 @@ load_rc_config $name : ${grok_exporter_config:=%%ETCDIR%%/config.yml} : ${grok_exporter_user:=prometheus} : ${grok_exporter_group:=prometheus} +: ${grok_exporter_log_file:=/var/log/grok_exporter.log} pidfile=/var/run/grok_exporter.pid command=/usr/sbin/daemon procname=%%PREFIX%%/bin/grok_exporter -command_args="-p ${pidfile} /usr/bin/env ${procname} -config ${grok_exporter_config}" +command_args="-p ${pidfile} /usr/bin/env ${procname} -config ${grok_exporter_config} >>${grok_exporter_log_file} 2>&1" start_precmd=grok_exporter_startprecmd grok_exporter_startprecmd() { + if [ ! -f "${grok_exporter_log_file}" ]; then + install -o ${grok_exporter_user} -g ${grok_exporter_group} -m 0640 /dev/null ${grok_exporter_log_file}; + fi if [ -e ${pidfile} ]; then chown ${grok_exporter_user}:${grok_exporter_group} ${pidfile}; else