From nobody Tue Jan 25 19:37:45 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8F287196ADE8; Tue, 25 Jan 2022 19:37:45 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jjxvs39vyz4r19; Tue, 25 Jan 2022 19:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643139465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4P2gQF2TppsTCoLNXtCLUBryIAj6nnUuj7lvNxaqTaY=; b=HDm+VhJXbWNrbccP6/XTaPZH/WmUPDQiPBsvfdAViMwiNNDqDkF57KcpjWq/Dad1dDnjKG dBU0UD1r/45sWjaZBuzy/+wLUZwszXAta9kX6FvN6UE4YDcFnkYyYVKGg0qYYLBirpKT/c zH3wjfq2jFFlWbZU719WEuOdmtoWVIshX4CnkLrKjuW3+trp7tEDLJu5rUl9bp+DkCBXIj /6DNGtWfDPswnhTeJFQLEHhtFcXPfROsPr82nbtWv09TjTLJsJyzLPhXrKjB4F4gvjYQmF eTWUX/mJNd6mzbQZujWf8qEx467/R75bHiNprMt6yyuipLHhtnoAiZ4oO/P9XA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D1AD7650; Tue, 25 Jan 2022 19:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20PJbjSQ091150; Tue, 25 Jan 2022 19:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20PJbjGb091149; Tue, 25 Jan 2022 19:37:45 GMT (envelope-from git) Date: Tue, 25 Jan 2022 19:37:45 GMT Message-Id: <202201251937.20PJbjGb091149@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dries Michiels Subject: git: dc765dc71a5b - main - databases/influxdb: Improve syslog logging title List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: driesm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc765dc71a5b03bfc463329c6699f4f6e5480f45 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643139465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4P2gQF2TppsTCoLNXtCLUBryIAj6nnUuj7lvNxaqTaY=; b=BxYEY+OZF6M5c10RScYM1ib9F/2sej/UePqAeVgGF4fVB9guiiTDtO7dpTXf0POseXcnLf GcJ+alhv2wKqYX3tisAYZ1oSXTTyxkg5i0fxaBvIsMq4ypApoGk/ikQqPlgscaC1lKM5tn kdG5AYcXVOPzWDd2cWwUzXWQ787sNy4FcBM0i+ICDIGAxM+WWhu38ZjJDTNn2g0z94DS07 rYTCeZErdkiN+qijeKOK6JtvDcezZmVl4UzCgCN2YyBHUNExS5WcxocChKIyssvAGfO3eo PydiUbb6xyYTUXkYcZ7FipcSXNkoY0i+HSiDnO3ci0h/QteFW0H2Kzvh38c2+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643139465; a=rsa-sha256; cv=none; b=cTCdf2YbSYDWWaw9EFBlMu8KnLu1TZmGiIvwEzQEV2Kxglyw8T0sWTifaUwvEnrgwiDz5p U4Gx0nxc3dOcMgtqqWGm208n84n1KCOb4nOaDOlY75km1Xt//CJgvLOZUpZnRbUzbr8JL3 en/iaQnVCqleMv+U2B/WanHer0jMN2MY4QRaV7l6XEBpFbQ2BO69BcjBICTkQBC/wnmg3w tOGpTeGB2oQOCWZR3Fr+tgdjbuiXPN4cussBPw2Khcio1wuxFR0pDcGyywfYyrNpAOTg9A SwtYeHwWmakrZQItQuFVMzHLXerdoYSiLQTz6qXGeK1EKzyPRJDTYGuEGX8aSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by driesm: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc765dc71a5b03bfc463329c6699f4f6e5480f45 commit dc765dc71a5b03bfc463329c6699f4f6e5480f45 Author: Jeremy Chadwick AuthorDate: 2022-01-16 09:37:06 +0000 Commit: Dries Michiels 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"