diff options
| author | Romain Tartière <romain@FreeBSD.org> | 2023-11-22 00:34:16 +0000 |
|---|---|---|
| committer | Romain Tartière <romain@FreeBSD.org> | 2023-11-23 04:59:33 +0000 |
| commit | f962d6a1c8e5a6c59c708baf3b4e8a38efedf27d (patch) | |
| tree | 54921cad7afa1d039d41cba9af711ea07ceca878 | |
| parent | 56ae3aa3d376d770585d650c11159c04e5d26f4b (diff) | |
| download | ports-f962d6a1c8e5a6c59c708baf3b4e8a38efedf27d.tar.gz ports-f962d6a1c8e5a6c59c708baf3b4e8a38efedf27d.zip | |
databases/puppetdb7: 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
| -rw-r--r-- | databases/puppetdb7/Makefile | 1 | ||||
| -rw-r--r-- | databases/puppetdb7/files/puppetdb.in | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/databases/puppetdb7/Makefile b/databases/puppetdb7/Makefile index 04791cf77f29..757ec1aadd44 100644 --- a/databases/puppetdb7/Makefile +++ b/databases/puppetdb7/Makefile @@ -1,5 +1,6 @@ PORTNAME= puppetdb PORTVERSION= 7.15.0 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= https://downloads.puppetlabs.com/puppetdb/ PKGNAMESUFFIX= 7 diff --git a/databases/puppetdb7/files/puppetdb.in b/databases/puppetdb7/files/puppetdb.in index 4e2f85a2d366..eb761d7ab425 100644 --- a/databases/puppetdb7/files/puppetdb.in +++ b/databases/puppetdb7/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}" |