From nobody Thu Nov 23 05:00:22 2023 X-Original-To: dev-commits-ports-all@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 4SbQsg0Knsz51Qml; Thu, 23 Nov 2023 05:00:23 +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 4SbQsf5Hp0z4Zcw; Thu, 23 Nov 2023 05:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700715622; 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=fmV7/0BdF3rgUnzm7R855gIG7Bpd9qSfCxipcXyuzbQ=; b=lUr+Syjk8frLW9dGplRJjEqm2JJnWzud84nQvGZYtBR0zsujxTCDAqwvD+M5w/2jGmYQv3 00cNf5LCXO90CtXndSBzmE2dduiEw5LzHUnlkncha55/pocRTkeAJAAGdeydyM+8RQW/rD QxAVobNIrW/CNLv/fSnlVV01HT6/PXbAiVmomaQv3cQgjyBYOtQHIVqD/lyn84PvUWLr6f FU6Oa0LX1z/Y+RPZjrvifkQqpS/wlopZxxfLEmhXHzI7+LAX5WjchIkFcJTFJqTykAeSl1 fgI45grhKTbF+1yRDPU9c4BMLh/w4l/ycsIzW5w9otFb3Ga3j7E9gmqfbjKPRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700715622; 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=fmV7/0BdF3rgUnzm7R855gIG7Bpd9qSfCxipcXyuzbQ=; b=sMc8Vfgd9mpCwOzEz8ZL5qt7O5rkbzYtBpNlNGtUg6/H3z14I0v8zw2jDNIR7rqJPt2RzO YoxOWRFLxbmkn6vs9sdq/P7kII1XGC7D4Iuj8NmAu2ErUGlHmVf810ypt9SygEp7L48+3+ 6PzoZFyfWzCPcju4jzI/9D2g41dT+e94vECJZfc7X86HiSe3PqiICDqLQJBsCbIPsGK45M tYQI1NwMmS5F64pfRsmIcBcM5b8CjCS7SCTUb6HxH1nNwyBvEeAiGXT1rtLkfAoK1vhmJY 5FG+C0sU+nM1UXKN4DRmypjs4vjtW0vq3chBMtt2V+d9wCBbpg0icyg1FMjhBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700715622; a=rsa-sha256; cv=none; b=gInP1NpuXGqBT39V/3zP3k9I/7CmRTf+uW02OXiSZo3Bm2JI+0oz1UVOdJ8q4omORi+zDy vDsaaSUXhINpuqHMDCi5y04lETJ46/0RnIBcKw2+YtrqQD3UTNXf5ThlvCO3FcmgAjO7bP Epvw8I0WKq34puQlLlcPlc/XVBMdQot6srrNHakwP00slcOq6qhupFcUdSA3aNKJ9nH0IK y3tOy3hntFzOfYZEIKty+9qL09khhp87BSCcPiTs6pers2pWW2ynvO7E6g6nMlJWDtBWzw feAtpC9pPqp8y+AEdmdQoxhQnNQb6/k22ASPOOfi63lJ9nDdb+UihhdTA5LRHg== 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 4SbQsf4PySznrj; Thu, 23 Nov 2023 05:00:22 +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 3AN50MqW099058; Thu, 23 Nov 2023 05:00:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AN50MCG099055; Thu, 23 Nov 2023 05:00:22 GMT (envelope-from git) Date: Thu, 23 Nov 2023 05:00:22 GMT Message-Id: <202311230500.3AN50MCG099055@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: d71f6a8ee8d4 - main - databases/puppetdb8: Fix logging List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: d71f6a8ee8d438075006738396c18b00241d0a12 Auto-Submitted: auto-generated The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=d71f6a8ee8d438075006738396c18b00241d0a12 commit d71f6a8ee8d438075006738396c18b00241d0a12 Author: Romain Tartière AuthorDate: 2023-11-22 00:34:57 +0000 Commit: Romain Tartière 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}"