From nobody Thu Nov 23 05:00:21 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SbQsf0jmhz51Qhj; Thu, 23 Nov 2023 05:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SbQsd4Xb0z4ZXr; Thu, 23 Nov 2023 05:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700715621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjJYr1s/hq3kMVO2FFd8WEaWpZb480S8F557C6SXGGQ=; b=RUItcitWj0856x4XbNlFNqUXtJkcuADTvuLyxavLTelU/SSGnMeKR9yzGbt71BpDqvLIJS zDnkL0tFMZF1BfP3j2OhyZeFSTAp0JEuKAc6FWAs4C1hcPS3InyU1rNXpylybDXRKcfDmw xGh+e9ek8GDaMwgE5x1oCTsYJHs4Hfbo7XO3mKwkKstzIrC3A5qgt5QFfFUxJvuvN8f1Bd MlgQMxe9OIJE1qPEXY/QfUmRwEgIUXBUBKmCByyM+xORjJrOv/Sv4QzPbkJtZWALqn4dQ9 smvxG0M4SWcr+TnYXIWhk28/WzzjIqFLYpDVrLnd4TVT1ikaqcjS4aEiZFIKrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700715621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjJYr1s/hq3kMVO2FFd8WEaWpZb480S8F557C6SXGGQ=; b=Kcrf92v1G0DFpgzo4NilmNzb/ZXvzj78G/pzHs+h1vu0xmEJg4nXOCJZXYR0M/wtW25VbA VJ41EfpqQGwOWQ5Xmr3dPYtd9iq/u2ayHmvIqd1+oxePj6KNsMgUzyVxV6/DbxE6ziorVw z+IEBZLiM4PvTSMfsVuC89n3l1sQgKnNLe9k+2uJ69uBExrRj+tmwK+DwsksVG9gFyQIF/ a1jd+cjKDEmKtnLcg7Aq6gYracKyYxkHTPvu9nzJ1eprAj9nskvXOPj5+uabjnDLi8r7x7 sgRMjHRxoeHrpHXSJ6Zfl1xKNg2gGBp3YT+uUiUEcLePbAXmLE1ZfFm4TKTnzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700715621; a=rsa-sha256; cv=none; b=Txkltj6lGM3Jm1Jv7KLKsrjesn8pbeCI4ej7KXfF2k1ft0xVHVy+WEKsyGIXyrrqa0sGjS zRrhI2Bil7cma17oaYc0L+uk5ipU+HmdCKJcPO16yR44BICd39sMZO6A89Bvf7TuopzyV0 O6npf2dSQd2FVzVIyO91O88jNmoFH/JGgrzBVTaiJDLK1375WO8QJqDyUz+19tSUJN8dGH sjGpJ8lXshC8EcPT82nNAah1a2v58Qvka8fYh7wZ8falkMzJ0EpFi1iQDNlCDeJh8t09A1 fA79Oq9PsDtpfLkIvsxyDsEjmYX+Nftp2kde6sZ/ZGcSurHwalwlCGwp6wSCKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SbQsd3fT7zpFB; Thu, 23 Nov 2023 05:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AN50LXp099019; Thu, 23 Nov 2023 05:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AN50L9v099016; Thu, 23 Nov 2023 05:00:21 GMT (envelope-from git) Date: Thu, 23 Nov 2023 05:00:21 GMT Message-Id: <202311230500.3AN50L9v099016@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Romain =?utf-8?Q?Tarti=C3=A8re?= Subject: git: f962d6a1c8e5 - main - databases/puppetdb7: Fix logging List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f962d6a1c8e5a6c59c708baf3b4e8a38efedf27d Auto-Submitted: auto-generated The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=f962d6a1c8e5a6c59c708baf3b4e8a38efedf27d commit f962d6a1c8e5a6c59c708baf3b4e8a38efedf27d Author: Romain Tartière AuthorDate: 2023-11-22 00:34:16 +0000 Commit: Romain Tartière CommitDate: 2023-11-23 04:59:33 +0000 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 --- databases/puppetdb7/Makefile | 1 + databases/puppetdb7/files/puppetdb.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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}"