Date: Thu, 23 Nov 2023 05:00:22 GMT From: Romain =?utf-8?Q?Tarti=C3=A8re?= <romain@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d71f6a8ee8d4 - main - databases/puppetdb8: Fix logging Message-ID: <202311230500.3AN50MCG099055@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=d71f6a8ee8d438075006738396c18b00241d0a12 commit d71f6a8ee8d438075006738396c18b00241d0a12 Author: Romain Tartière <romain@FreeBSD.org> AuthorDate: 2023-11-22 00:34:57 +0000 Commit: Romain Tartière <romain@FreeBSD.org> CommitDate: 2023-11-23 04:59:40 +0000 databases/puppetdb8: Fix logging Some changes in PuppetDB recently broke logging. Ensure we write logs as before. While here, do some cleanup of the Makefile. With hat: puppet --- databases/puppetdb8/Makefile | 1 + databases/puppetdb8/files/puppetdb.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/databases/puppetdb8/Makefile b/databases/puppetdb8/Makefile index c81ebd2dd7b0..b51ae0ee9f8d 100644 --- a/databases/puppetdb8/Makefile +++ b/databases/puppetdb8/Makefile @@ -1,5 +1,6 @@ PORTNAME= puppetdb PORTVERSION= 8.2.0 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 8 diff --git a/databases/puppetdb8/files/puppetdb.in b/databases/puppetdb8/files/puppetdb.in index 4e2f85a2d366..eb761d7ab425 100644 --- a/databases/puppetdb8/files/puppetdb.in +++ b/databases/puppetdb8/files/puppetdb.in @@ -53,7 +53,7 @@ pidfile="/var/run/puppetdb/puppetdb.pid" command="/usr/sbin/daemon" java_cmd="${puppetdb_java_home}/bin/java" procname="${java_cmd}" -command_args="-p ${pidfile} ${java_cmd} ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core ${puppetdb_args} > ${puppetdb_log_file} 2>&1" +command_args="-p ${pidfile} ${java_cmd} -Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger -Dlogappender=F1 ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core ${puppetdb_args} > ${puppetdb_log_file} 2>&1" required_files="${java_cmd}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311230500.3AN50MCG099055>