Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Mar 2022 13:05:27 GMT
From:      Mateusz Piotrowski <0mp@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 2ae66e8ad04d - main - net-mgmt/alertmanager: Fix logging
Message-ID:  <202203031305.223D5RSg087928@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203031305.223D5RSg087928>