git: dd54a6ae9731 - 2022Q1 - net-mgmt/alertmanager: Fix logging
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 03 Mar 2022 13:06:37 UTC
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