aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateusz Piotrowski <0mp@FreeBSD.org>2022-03-03 12:55:12 +0000
committerMateusz Piotrowski <0mp@FreeBSD.org>2022-03-03 13:05:50 +0000
commitdd54a6ae973193a061dcb0b5a328a52aa321079c (patch)
treed59ee434341731ae9a5f6df395a16c5fdb1846c6
parentdc5ae3771737a8c06c29d12ef07c6dabfbd62ae2 (diff)
downloadports-dd54a6ae973193a061dcb0b5a328a52aa321079c.tar.gz
ports-dd54a6ae973193a061dcb0b5a328a52aa321079c.zip
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)
-rw-r--r--net-mgmt/alertmanager/Makefile1
-rw-r--r--net-mgmt/alertmanager/files/alertmanager.in4
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