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
This commit is contained in:
Romain Tartière 2023-11-21 14:34:57 -10:00
parent f962d6a1c8
commit d71f6a8ee8
No known key found for this signature in database
GPG key ID: BA4D1D955112336F
2 changed files with 2 additions and 1 deletions

View file

@ -1,5 +1,6 @@
PORTNAME= puppetdb
PORTVERSION= 8.2.0
PORTREVISION= 1
CATEGORIES= databases java
MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/
PKGNAMESUFFIX= 8

View file

@ -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}"