From nobody Thu Mar 3 13:06:37 2022 X-Original-To: dev-commits-ports-branches@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 369EF1A014A0; Thu, 3 Mar 2022 13:06:38 +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 4K8WTV12Swz3D2p; Thu, 3 Mar 2022 13:06:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646312798; 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=fAc8WSwSrRtj8wLl4TPkI7U8yfjHf1VaXmSWK/gKCR0=; b=hmVl1qSH7V2I+8ruqKccoNq5/5KI0fKn4GO5NXjvKiHqQYlS1Lh0z9QHyEFwRCKLUzS6Jh TeF9ewwNAAsv/mdRqsaIRJnUkz6a6j315uAoX8lWjYbRNJRuYIKwhSGYmW6nQDRbADNPR6 QgzlP6OzYfuOA56JusY+/yMWyk4UFyT+mk7NBCSO6bVvh3l17Yz6f4xNZG3CCrSKCyjwn8 Ce/sXR0fi2iNS7kCDp5ZrG1ECgIhoDQNSD/9TQGWlJjNLoUabFWXf+apNKQTaQlfVdvpZa Fcz3M5FZcwMhETgak7CIMRmVWe+Ddv/TNjoRly+awZ/3HWM/wP+Z62SRkcV0/w== 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 03BB818428; Thu, 3 Mar 2022 13:06:38 +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 223D6bcY088131; Thu, 3 Mar 2022 13:06:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223D6b4A088130; Thu, 3 Mar 2022 13:06:37 GMT (envelope-from git) Date: Thu, 3 Mar 2022 13:06:37 GMT Message-Id: <202203031306.223D6b4A088130@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: dd54a6ae9731 - 2022Q1 - net-mgmt/alertmanager: Fix logging List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q1 X-Git-Reftype: branch X-Git-Commit: dd54a6ae973193a061dcb0b5a328a52aa321079c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646312798; 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=fAc8WSwSrRtj8wLl4TPkI7U8yfjHf1VaXmSWK/gKCR0=; b=aGj2CQNKuylmWMmlHss70+AclN8DJXFr1BLo3CQHT2tQUcc8GUzixy9x9hPI1czBrcLbyu rtbe3MA6Q79qerDTL7K9Ax5CNS1CL5V9ELONbi1G5x3CVU6wqj/SHAZsfpH9PAIUHqnhhj iWXGjBJjdWAzCgxbndcnHFRlbXhoeAhd1/P+ch1d6w43qpZ63zioiWtbre4LPA7u/R4r+n AJKHDhlYPwcsL768+k9N1XDSU1pLKEz5P5gyvgQpHn4wl7wk6mSaWIEHfbrRlcEk2fdRxt WyyxAyPWmKP5I9o96Dq1ZyLbgU71ex4/aw2jfPARpaI8CprZG8EqZJeFFEFIBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646312798; a=rsa-sha256; cv=none; b=ZKZ9fYRLVwlQH11c/9/nh+yJVRu+chJauqsRZJCI+JwdKOrF+V00Uy8eARJd+dmXkAj1y0 X7qRXCMvvUbJABoOZJZf6Y4UZ3+54AV8KIi2h/WWzQytJnPjSn5UjvMBYkUroCANtjbXxX ysLj9MI61Hg1fcgNeRljYh5dALUjyeO+0Un4eGc512r11ba02Vbxut6aShxVmKqID+TpIA Mq56V9XgKkWn803EIJAPksCn/uX2zNAzeQSVa7vO7rgYdV3PRMTaO2nQmL8Gp3losg2KoF hFbpjD7XvinmFTm2cutatyTFaKi4rtL9l0/P09Gt2d1SZ8NatW3uFwlqyjTGmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd54a6ae973193a061dcb0b5a328a52aa321079c commit dd54a6ae973193a061dcb0b5a328a52aa321079c 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:05:50 +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 (cherry picked from commit 2ae66e8ad04d144309c640e5bc02cdb19535e061) --- 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 01bd7cd74ba5..d8967ef34407 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