From owner-svn-ports-head@freebsd.org  Sun Apr 26 13:28:35 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id D052D2B0B0D;
 Sun, 26 Apr 2020 13:28:35 +0000 (UTC)
 (envelope-from meta@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4997yq4lqJz4VD1;
 Sun, 26 Apr 2020 13:28:35 +0000 (UTC)
 (envelope-from meta@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 9970C218A1;
 Sun, 26 Apr 2020 13:28:35 +0000 (UTC)
 (envelope-from meta@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03QDSZR0088952;
 Sun, 26 Apr 2020 13:28:35 GMT (envelope-from meta@FreeBSD.org)
Received: (from meta@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03QDSZbO088950;
 Sun, 26 Apr 2020 13:28:35 GMT (envelope-from meta@FreeBSD.org)
Message-Id: <202004261328.03QDSZbO088950@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: meta set sender to
 meta@FreeBSD.org using -f
From: Koichiro Iwao <meta@FreeBSD.org>
Date: Sun, 26 Apr 2020 13:28:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r533060 - in head/sysutils/mackerel-agent: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: meta
X-SVN-Commit-Paths: in head/sysutils/mackerel-agent: . files
X-SVN-Commit-Revision: 533060
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Apr 2020 13:28:35 -0000

Author: meta
Date: Sun Apr 26 13:28:34 2020
New Revision: 533060
URL: https://svnweb.freebsd.org/changeset/ports/533060

Log:
  sysutils/mackerel-agent: improve rc script
  
  not to spit out logs on console.

Modified:
  head/sysutils/mackerel-agent/Makefile
  head/sysutils/mackerel-agent/files/mackerel_agent.in

Modified: head/sysutils/mackerel-agent/Makefile
==============================================================================
--- head/sysutils/mackerel-agent/Makefile	Sun Apr 26 13:07:28 2020	(r533059)
+++ head/sysutils/mackerel-agent/Makefile	Sun Apr 26 13:28:34 2020	(r533060)
@@ -3,6 +3,7 @@
 PORTNAME=	mackerel-agent
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.67.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	meta@FreeBSD.org

Modified: head/sysutils/mackerel-agent/files/mackerel_agent.in
==============================================================================
--- head/sysutils/mackerel-agent/files/mackerel_agent.in	Sun Apr 26 13:07:28 2020	(r533059)
+++ head/sysutils/mackerel-agent/files/mackerel_agent.in	Sun Apr 26 13:28:34 2020	(r533060)
@@ -20,6 +20,14 @@ load_rc_config ${name}
 : ${mackerel_agent_config:=%%ETCDIR%%/mackerel-agent.conf}
 
 command="%%PREFIX%%/bin/mackerel-agent"
-command_args="--conf=${mackerel_agent_config} &"
+required_files="${mackerel_agent_config}"
+command_args="supervise -conf ${mackerel_agent_config} ${mackerel_agent_flags}"
+
+start_cmd=mackerel_agent_start
+
+mackerel_agent_start()
+{
+	/usr/sbin/daemon -cf -S -T mackerel-agent ${command} ${command_args}
+}
 
 run_rc_command "$1"