From nobody Thu Mar 03 13:05:27 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 195211A011B1; Thu, 3 Mar 2022 13:05:28 +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 4K8WS76l6Gz3Ck1; Thu, 3 Mar 2022 13:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646312728; 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=yzB400XbIFudI+IlCrD9tg8TxKimXmitqbCs5D6Tg/I=; b=BQ2cFcxD/Fo0873N08pPSNXS4WiUm1FSf+IvdkaU4ZlPcNSZriqjCcE2/9hDWVZvF1CFbZ INzpKvcSaIbpzNjkPoSK9woSRzKzrFU3Oov2w7jEt8l782w28v2BL9KYy7O4Ykl74n7rHf tuNVa4nYIpm7cxTeVatIPphscY0zdG1Kek3XVvIDJWjEHyuYvzTuBhkBNFaB6xQ8MDcGb3 7/HpEO3ET5Wp79IKtls9c45/QAAQ2oYq6PRnwKC3euQisILC6wMlvv3ZrH9mDo9tLddsen evxW+Emt3a2kOuT3hBzIlEWwBcwSkb1ApXHh/fkAAJ4y4R8P9gUv2YP64Vuhww== 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 C34BC185BC; Thu, 3 Mar 2022 13:05:27 +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 223D5RDI087929; Thu, 3 Mar 2022 13:05:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223D5RSg087928; Thu, 3 Mar 2022 13:05:27 GMT (envelope-from git) Date: Thu, 3 Mar 2022 13:05:27 GMT Message-Id: <202203031305.223D5RSg087928@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 2ae66e8ad04d - main - net-mgmt/alertmanager: Fix logging 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: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ae66e8ad04d144309c640e5bc02cdb19535e061 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646312728; 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=yzB400XbIFudI+IlCrD9tg8TxKimXmitqbCs5D6Tg/I=; b=uSiLLbw41B5pioygSkmbarCMPxoiJswqPmp7Gq5goc1KNveAmgiHu4KVFzkUK9RXMwNHTM 5eN5HvNRlwImUay/xOKfr/vA7VaOTRXCdSGIDiW2bI8dUjp6hrj0+TQbvKCUIFqggZuFGO uvy2/YfY1VUZDRSgk7fq4uwLASwUWN2J0O74DgT/7G27nBs5jD3I0UIOHbjWoKJqPj0Sax w3ZQ3Y59X2ReQibM9wyUKdPS/JqKJVKrnnWIYGLyGtUMU3lmIqRFD8m51FWv99vEV2UtS2 JdHvNixqd5pSKx0f1+igOYDN1QLPRPYu7GAAL45Z8sdBWRK8o2tBJZZLVTCqFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646312728; a=rsa-sha256; cv=none; b=EGbYHQ2VpDSRCumxGf94LgialEKBZzdwHExyhiwuVJj2mf1ujd4StsuGk/9HpHwCXyMgRj Lts2+8P5Egy3rTo3PeQF0ySam8Oufx2ynxWDMVfmWQF0oe6Ps4zr72M6amXFpFE9Bl3RJL 35exeKitcuoE9qT1b/gpkjLMaNDm+lYUARDNw0RvwXby8UXHVrw3Y0juyjmX8VBUPxRm7j 3vujYpn8pq6D7kidwE2zoSpn6G5Ic1Czk217JYV/a6z0gXynmL4M4sRaSC35YWiQrErjnD w8+jW0Qeic6iv09hWa08uDn++SsFjLphu4eBOlH3mMjExPmf6Rekj6jq2yzxXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ae66e8ad04d144309c640e5bc02cdb19535e061 commit 2ae66e8ad04d144309c640e5bc02cdb19535e061 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-03-03 12:55:12 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-03-03 13:04:53 +0000 net-mgmt/alertmanager: Fix logging Redirect stdout and stderr of the Alertmanager to its log file with the daemon(8) -o flag instead of shell redirections. The reason for this change is that shell redirections simply do not work in this case. While here, remove an unnecessary env(1) invocation. Approved by: portmgr blanket (runtime fix) Fixes: df292e75acbe MFH: 2022Q1 Sponsored by: Ekco Sponsored by: Klara Inc --- net-mgmt/alertmanager/Makefile | 1 + net-mgmt/alertmanager/files/alertmanager.in | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net-mgmt/alertmanager/Makefile b/net-mgmt/alertmanager/Makefile index 59ab8ecaec9b..107ca0ada9f8 100644 --- a/net-mgmt/alertmanager/Makefile +++ b/net-mgmt/alertmanager/Makefile @@ -3,6 +3,7 @@ PORTNAME= alertmanager PORTVERSION= 0.23.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= michal@hanu.la diff --git a/net-mgmt/alertmanager/files/alertmanager.in b/net-mgmt/alertmanager/files/alertmanager.in index d4c8cac649cf..6dd39aea2e9d 100644 --- a/net-mgmt/alertmanager/files/alertmanager.in +++ b/net-mgmt/alertmanager/files/alertmanager.in @@ -43,10 +43,10 @@ command="/usr/sbin/daemon" procname="%%PREFIX%%/bin/alertmanager" sig_reload=HUP extra_commands="reload" -command_args="-p ${pidfile} /usr/bin/env ${procname} \ +command_args="-o ${alertmanager_log_file} -p ${pidfile} ${procname} \ --config.file=${alertmanager_config} \ --storage.path=${alertmanager_data_dir} \ - ${alertmanager_args} > ${alertmanager_log_file} 2>&1" + ${alertmanager_args}" start_precmd=alertmanager_startprecmd