On Wed, Dec 21, 2016 at 05:51:56AM -0700, Landry Breuil wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: [email protected] 2016/12/21 05:51:56
>
> Log message:
> Import riemann 0.2.12, from MAINTAINER Pavel Korovin /p/tristero/se
>
> Riemann provides low-latency, transient shared state for systems with many
> moving parts.
> Riemann aggregates events from your servers and applications with a
> powerful
> stream processing language. Send an email for every exception raised by
> your
> code. Track the latency distribution of your web app. See the top
> processes
> on any host, by memory and CPU. Combine statistics from every Riak node in
> your cluster and forward to Graphite. Send alerts when a key process fails
> to check in. Know how many users signed up right this second.
>
> ok sthen@
>
> Status:
>
> Vendor Tag: pkorovin
> Release Tags: landry_20161221
>
> N ports/sysutils/riemann/Makefile
> N ports/sysutils/riemann/distinfo
> N ports/sysutils/riemann/patches/patch-etc_riemann_config
> N ports/sysutils/riemann/patches/patch-bin_riemann
> N ports/sysutils/riemann/pkg/riemann.rc
> N ports/sysutils/riemann/pkg/DESCR
> N ports/sysutils/riemann/pkg/PLIST
>
> No conflicts created by this import
The rc.d script is weird, here are some proposed changes:
- put variable where they belong and follow the template
- we set rc_bg, so use ${_bg}
- no need to run in a sub-shell
- drop daemon_log, the name looks too much like an rc.d variable
- while here, drop the log file altogether; do we really need it? it's
overwritten each time riemann starts
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/riemann/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 21 Dec 2016 12:51:56 -0000 1.1.1.1
+++ Makefile 22 Dec 2016 10:19:51 -0000
@@ -5,6 +5,7 @@ COMMENT= network event stream processing
V= 0.2.12
DISTNAME= riemann-${V}
CATEGORIES= sysutils
+REVISION= 0
HOMEPAGE= http://riemann.io
Index: pkg/riemann.rc
===================================================================
RCS file: /cvs/ports/sysutils/riemann/pkg/riemann.rc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 riemann.rc
--- pkg/riemann.rc 21 Dec 2016 12:51:56 -0000 1.1.1.1
+++ pkg/riemann.rc 22 Dec 2016 10:19:51 -0000
@@ -4,17 +4,16 @@
daemon="${TRUEPREFIX}/bin/riemann"
daemon_user="_riemann"
-daemon_log="${LOCALSTATEDIR}/log/riemann/riemann.log"
-
-rc_bg=YES
. /etc/rc.d/rc.subr
java="$(${LOCALBASE}/bin/javaPathHelper -c clojure)"
+
pexp="${java}.*riemann.*"
+rc_bg=YES
rc_start() {
- (${rcexec} "JAVA_CMD=\"${java}\" ${daemon} > ${daemon_log} 2>&1") &
+ ${rcexec} "JAVA_CMD=\"${java}\" ${daemon} ${_bg}"
}
rc_cmd $1
--
Antoine
