git: dc765dc71a5b - main - databases/influxdb: Improve syslog logging title
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 25 Jan 2022 19:37:45 UTC
The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc765dc71a5b03bfc463329c6699f4f6e5480f45 commit dc765dc71a5b03bfc463329c6699f4f6e5480f45 Author: Jeremy Chadwick <jdc@koitsu.org> AuthorDate: 2022-01-16 09:37:06 +0000 Commit: Dries Michiels <driesm@FreeBSD.org> CommitDate: 2022-01-25 19:35:35 +0000 databases/influxdb: Improve syslog logging title This changes the log entries from "daemon[PID]: logmesage" to "influxd[PID]: logmessage". While here, remove trailing spaces. Approved by: 0mp (mentor) Pull Request: https://github.com/freebsd/freebsd-ports/pull/121 Differential Revision: https://reviews.freebsd.org/D33907 --- databases/influxdb/Makefile | 1 + databases/influxdb/files/influxd.in | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile index 1520087c287a..0f9492e463f8 100644 --- a/databases/influxdb/Makefile +++ b/databases/influxdb/Makefile @@ -1,6 +1,7 @@ PORTNAME= influxdb DISTVERSIONPREFIX= v DISTVERSION= 1.8.10 +PORTREVISION= 1 CATEGORIES= databases net-mgmt MAINTAINER= driesm@FreeBSD.org diff --git a/databases/influxdb/files/influxd.in b/databases/influxdb/files/influxd.in index 57c3892f1cff..539daf16d49c 100644 --- a/databases/influxdb/files/influxd.in +++ b/databases/influxdb/files/influxd.in @@ -43,7 +43,7 @@ influxd_pidfile="%%INFLUXD_PIDDIR%%${name}.pid" procname="%%PREFIX%%/bin/${name}" command=/usr/sbin/daemon start_precmd="influxd_precmd" -start_cmd="influxd_startcmd_%%INFLUXD_LOGCMD%%" +start_cmd="influxd_startcmd_%%INFLUXD_LOGCMD%%" influxd_precmd() { @@ -52,16 +52,16 @@ influxd_precmd() influxd_startcmd_daemon() { - echo "Starting ${name}." - /usr/sbin/daemon -c -p ${influxd_pidfile} -S -s ${influxd_priority} -l ${influxd_facility} \ - -u ${influxd_user} ${procname} ${influxd_options} + echo "Starting ${name}." + /usr/sbin/daemon -c -p ${influxd_pidfile} -S -s ${influxd_priority} -l ${influxd_facility} -T ${name} \ + -u ${influxd_user} ${procname} ${influxd_options} } -influxd_startcmd_logger() +influxd_startcmd_logger() { - echo "Starting ${name}." + echo "Starting ${name}." /usr/sbin/daemon -c -p ${influxd_pidfile} -u ${influxd_user} /bin/sh -c "${procname} ${influxd_options} 2>&1 \ | /usr/bin/logger -t ${name} -p ${influxd_facility}.${influxd_priority}" -} +} run_rc_command "$1"