From e16c78f7ea22238ef7f7beee40cc55fe1af7fc70 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Tue, 28 Dec 2021 14:55:25 -0600
Subject: [PATCH] log4j config

---
 .../src/test/resources/log4j2.properties      | 58 ++++++++++++-------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/hibernate-core/src/test/resources/log4j2.properties b/hibernate-core/src/test/resources/log4j2.properties
index c7433345bc..40d172bf13 100644
--- a/hibernate-core/src/test/resources/log4j2.properties
+++ b/hibernate-core/src/test/resources/log4j2.properties
@@ -4,66 +4,67 @@
 # License: GNU Lesser General Public License (LGPL), version 2.1 or later.
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 
-# Normal STDOUT appender
-appender.stdout.name=STDOUT
+
+###############################################################################
+## root logging
+
+appender.stdout.name=stdout
 appender.stdout.type=Console
 appender.stdout.layout.type=PatternLayout
 appender.stdout.layout.pattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
+rootLogger.level=info
+rootLogger.appenderRef.stdout.ref=stdout
+
+
+###############################################################################
+## subsystem-based logging
+
 appender.subsystem.name=subsystem
 appender.subsystem.type=Console
 appender.subsystem.layout.type=PatternLayout
-appender.subsystem.layout.pattern=%d{ABSOLUTE} %5p %15.25c{5} %C{1}:%L - %m%n
+appender.subsystem.layout.pattern=[subsystem] %5p %15.25c{5} %C{1}:%L - %m%n
 
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=STDOUT
+logger.subsystem-root.name=org.hibernate.orm
+logger.subsystem-root.level=info
+logger.subsystem-root.additivity=false
+logger.subsystem-root.appenderRef.subsystem.ref=subsystem
 
-# SQL Logging - HHH-6833
-logger.sql.name=org.hibernate.SQL
-logger.sql.level=debug
 
 
 ###############################################################################
 # sub-system based logging
 
 logger.jdbc-bind.name=org.hibernate.orm.jdbc.bind
-logger.jdbc-bind.appenderRef.subsystem.ref=subsystem
 logger.jdbc-bind.level=trace
 
 logger.jdbc-extract.name=org.hibernate.orm.jdbc.extract
-logger.jdbc-extract.appenderRef.subsystem.ref=subsystem
 logger.jdbc-extract.level=trace
 
 # "Graph Language" Antlr parsing
 logger.graph.name=org.hibernate.orm.graph
-logger.graph.appenderRef.subsystem.ref=subsystem
 #logger.graph.level=debug
 
 # SQL import script processing
 #       NOTE : see org.hibernate.tool.schema.ast.SqlScriptLogging
 logger.tooling-schema-script.name=org.hibernate.orm.tooling.schema.script
-logger.tooling-schema-script.appenderRef.subsystem.ref=subsystem
 #logger.tooling-schema-script.level=trace
 
 # SQL import script parsed AST logging
 #       NOTE : see org.hibernate.tool.schema.ast.SqlScriptLogging
 logger.tooling-schema-script-graph.name=org.hibernate.orm.tooling.schema.script.graph
-logger.tooling-schema-script-graph.appenderRef.subsystem.ref=subsystem
 #logger.tooling-schema-script-graph.level=trace
 
 # Logging related to the creation of DomainResult/Fetch graphs
 logger.sql-result-graph.name=org.hibernate.orm.sql.results
-logger.sql-result-graph.appenderRef.subsystem.ref=subsystem
-logger.sql-result-graph.level=debug
+#logger.sql-result-graph.level=debug
 
 # Logs generated DomainResult/Fetch AST graph
 logger.sql-result-ast.name=org.hibernate.orm.sql.results.graph.AST
-logger.sql-result-ast.appenderRef.subsystem.ref=subsystem
-logger.sql-result-ast.level=debug
+#logger.sql-result-ast.level=debug
 
 ## Logs every SQM tree
 logger.sqm-tree.name=org.hibernate.orm.query.sqm.ast
-logger.sqm-tree.appenderRef.subsystem.ref=subsystem
 #logger.sqm-tree.level=debug
 
 
@@ -71,6 +72,15 @@ logger.sqm-tree.appenderRef.subsystem.ref=subsystem
 ###############################################################################
 # package/class name based logging
 
+# SQL Logging - HHH-6833
+logger.sql.name=org.hibernate.SQL
+logger.sql.level=debug
+
+logger.tests.name=org.hibernate.orm.test
+logger.tests.level=info
+logger.tests.additivity=false
+logger.tests.appenderRef.stdout.ref=stdout
+
 logger.hbm2ddl.name=org.hibernate.tool.hbm2ddl
 #logger.hbm2ddl.level=trace
 
@@ -124,14 +134,20 @@ logger.stat.name=org.hibernate.stat
 logger.stat.level=trace
 
 
+
+###############################################################################
 ## Hibernate's JUnit extensions (hibernate-testing)
-##      - set to DEBUG or TRACE to see additional details
-##        from those extensions
+##   - set to DEBUG or TRACE to see additional details from those extensions
+
 logger.junit.name=org.hibernate.testing.orm.junit
+logger.junit.additivity=false
 logger.junit.appenderRef.subsystem.ref=subsystem
 #logger.junit.level=debug
 
-# Specialized handling for tracking unclosed Session/SessionFactory resources as part of testing
+
+###############################################################################
+# Specialized logging for tracking unclosed test resources (Session, SessionFactory, ...)
+
 appender.unclosedSessionFactoryFile.type=File
 appender.unclosedSessionFactoryFile.name=unclosedSessionFactoryFile
 appender.unclosedSessionFactoryFile.append=true