svn commit: r531015 - in head/net-mgmt/ping_exporter: . files

[Ryan Steinmetz]

Author: zi
Date: Tue Apr  7 14:39:51 2020
New Revision: 531015
URL: https://svnweb.freebsd.org/changeset/ports/531015

Log:
  - Move logging to a solution that will easily permit log rotation
  - Bump PORTREVISION
  
  Approved by:	maintainer (via privmsg)

Added:
  head/net-mgmt/ping_exporter/files/ping_exporter.newsyslog   (contents, props changed)
  head/net-mgmt/ping_exporter/files/ping_exporter.syslog   (contents, props changed)
  head/net-mgmt/ping_exporter/files/pkg-message.in   (contents, props changed)
Modified:
  head/net-mgmt/ping_exporter/Makefile
  head/net-mgmt/ping_exporter/files/ping_exporter.in
  head/net-mgmt/ping_exporter/pkg-plist

Modified: head/net-mgmt/ping_exporter/Makefile
==============================================================================
--- head/net-mgmt/ping_exporter/Makefile	Tue Apr  7 14:36:35 2020	(r531014)
+++ head/net-mgmt/ping_exporter/Makefile	Tue Apr  7 14:39:51 2020	(r531015)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ping_exporter
 DISTVERSION=	0.44
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	jp+ports at supplntr.io
@@ -29,5 +29,11 @@ pre-build:
 post-install:
 	${INSTALL_DATA} ${PATCHDIR}/ping_exporter.yml.sample \
 		${STAGEDIR}${PREFIX}/etc/ping_exporter.yml.sample
+	${MKDIR} ${STAGEDIR}${DATADIR}/syslog.d \
+	    	${STAGEDIR}${DATADIR}/newsyslog.conf.d
+	${INSTALL_DATA} ${PATCHDIR}/ping_exporter.syslog \
+		${STAGEDIR}${DATADIR}/syslog.d/ping_exporter.conf
+	${INSTALL_DATA} ${PATCHDIR}/ping_exporter.newsyslog \
+		${STAGEDIR}${DATADIR}/newsyslog.conf.d/ping_exporter.conf
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/ping_exporter/files/ping_exporter.in
==============================================================================
--- head/net-mgmt/ping_exporter/files/ping_exporter.in	Tue Apr  7 14:36:35 2020	(r531014)
+++ head/net-mgmt/ping_exporter/files/ping_exporter.in	Tue Apr  7 14:39:51 2020	(r531015)
@@ -21,8 +21,6 @@
 #               Default is "localhost:9427".
 # ping_exporter_config (string):        Set configuration file of ping_exporter
 #               Default is "%%PREFIX%%/etc/ping_exporter.yml".
-# ping_exporter_log_file (string):      Set log file of ping_exporter
-#               Default is "/var/log/ping_exporter.log".
 
 . /etc/rc.subr
 
@@ -37,16 +35,16 @@ load_rc_config $name
 : ${ping_exporter_group:=nobody}
 : ${ping_exporter_listen_address=localhost:9427}
 : ${ping_exporter_config="%%PREFIX%%/etc/ping_exporter.yml"}
-: ${ping_exporter_log_file=/var/log/ping_exporter.log}
 
 required_files="${ping_exporter_config}"
 pidfile=/var/run/ping_exporter.pid
 command=/usr/sbin/daemon
 procname="%%PREFIX%%/bin/ping_exporter"
-command_args="-p ${pidfile} /usr/bin/env ${procname} \
+command_args="-p ${pidfile} -t ${name} -T ${name} -S \
+    /usr/bin/env ${procname} \
     -web.listen-address ${ping_exporter_listen_address} \
     -config.path ${ping_exporter_config} \
-    ${ping_exporter_args} >> ${ping_exporter_log_file} 2>&1"
+    ${ping_exporter_args} 2>&1"
 
 start_precmd=ping_exporter_startprecmd
 
@@ -56,11 +54,6 @@ ping_exporter_startprecmd()
         install -o ${ping_exporter_user} -g ${ping_exporter_group} /dev/null ${pidfile};
     else
         chown ${ping_exporter_user}:${ping_exporter_group} ${pidfile};
-    fi
-    if [ ! -e ${ping_exporter_log_file} ]; then
-        install -o ${ping_exporter_user} -g ${ping_exporter_group} -m 640 /dev/null ${ping_exporter_log_file};
-    else
-        chown ${ping_exporter_user}:${ping_exporter_group} ${ping_exporter_log_file};
     fi
 }
 

Added: head/net-mgmt/ping_exporter/files/ping_exporter.newsyslog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/ping_exporter/files/ping_exporter.newsyslog	Tue Apr  7 14:39:51 2020	(r531015)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+/var/log/ping_exporter.log		644  7	1000	*	J

Added: head/net-mgmt/ping_exporter/files/ping_exporter.syslog
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/ping_exporter/files/ping_exporter.syslog	Tue Apr  7 14:39:51 2020	(r531015)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+!ping_exporter
+*.*						/var/log/ping_exporter.log

Added: head/net-mgmt/ping_exporter/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/ping_exporter/files/pkg-message.in	Tue Apr  7 14:39:51 2020	(r531015)
@@ -0,0 +1,15 @@
+[
+{ type: install
+  message: <<EOM
+ping_exporter logs via syslog.  To see examples for log rotation
+and redirecting the logs to a dedicated log file, please see
+%%DATADIR%%
+
+The syslog file would be copied to:
+/usr/local/etc/syslog.d
+
+The newsyslog file would be copied to:
+/usr/local/etc/newsyslog.conf.d
+EOM
+}
+]

Modified: head/net-mgmt/ping_exporter/pkg-plist
==============================================================================
--- head/net-mgmt/ping_exporter/pkg-plist	Tue Apr  7 14:36:35 2020	(r531014)
+++ head/net-mgmt/ping_exporter/pkg-plist	Tue Apr  7 14:39:51 2020	(r531015)
@@ -1,2 +1,4 @@
 bin/ping_exporter
 @sample %%ETCDIR%%.yml.sample
+%%DATADIR%%/newsyslog.conf.d/ping_exporter.conf
+%%DATADIR%%/syslog.d/ping_exporter.conf