Issue 23631 create global log4j #23964

spbolton · 2023-01-31T20:02:12Z

Updated pull request from #23632 Issue #23631 Enable log configuration by setting environment variable USE_GLOBAL_LOG4J=true

Default logging config found in log4j2/conf/log4j2-tomcat.xml

bin/setclasspath.sh or bin/setclasspath.bat contains logic to setup

if [ "$USE_GLOBAL_LOG4J" = true ]; then
echo Using Global Log4j
CLASSPATH="$CATALINA_HOME/log4j2/lib/*:$CATALINA_HOME/log4j2/conf$CLASSPATH"
JAVA_OPTS=" -DLog4jContextSelector=org.apache.logging.log4j.core.async.BasicAsyncLoggerContextSelector $JAVA_OPTS"
JAVA_OPTS=" -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager $JAVA_OPTS"
fi

default Context selector creates a new context per Classloader and requires separate configuration for each. BasicContextSelection keeps the same context and configuration for all Classloaders, for each there is an Async version that makes all the loggers asynchronous and improves performance.

The log4j jars have been added to $CATALINA_HOME/log4j2/lib to support slf4j, commons-logging, Jul logging log4j 1. A log4j2-appserver jar is set up to replace the standard tomcat logging. Although the log4j2-appserver replaces the jul logging in tomcat directly Some plugin code uses java.util.logging and the LogManger needs to be set to pass this logging back to log4j.

By default the logfile is picked up from the classpath and found in CATALINA_HOME/log4j2/conf see

https://logging.apache.org/log4j/2.x/log4j-appserver/index.html

The log file could be specified with a jvm option -Dlog4j.configurationFile=path/to/log4j2.xml or map the file/folder in docker.

Read configuration guide https://logging.apache.org/log4j/2.x/manual/configuration.html on how to modify the config,https://logging.apache.org/log4j/2.x/manual/configuration.html It is currently set to only log to stdout. for docker.

github-actions · 2023-01-31T20:21:42Z

Unit Tests Report

1 418 tests ±0 1 408 ✔️ ±0 3m 47s ⏱️ -15s
  140 suites ±0     10 💤 ±0
  140 files ±0       0 ❌ ±0

Results for commit aa5f866. ± Comparison against base commit adfff75.

♻️ This comment has been updated with latest results.

github-actions · 2023-01-31T20:35:07Z

Postman Tests Report

0 files -     54 0 suites - 733 0s ⏱️ - 1h 31m 11s
0 tests -   362 0 ✔️ -   361 0 💤 ±0 0 ❌ - 1
0 runs - 1 118 0 ✔️ - 1 113 0 💤 ±0 0 ❌ - 5

Results for commit c0b488f. ± Comparison against base commit 9d691ee.

♻️ This comment has been updated with latest results.

github-actions · 2023-01-31T21:28:10Z

Integration Tests [postgres] Report

  408 files -   1   408 suites - 1 58m 59s ⏱️ - 10m 16s
3 878 tests - 14 3 734 ✔️ - 134 23 💤 ±0 121 ❌ +120
3 900 runs - 13 3 755 ✔️ - 134 23 💤 ±0 122 ❌ +121

For more details on these failures, see this check.

Results for commit aa5f866. ± Comparison against base commit adfff75.

♻️ This comment has been updated with latest results.

github-actions · 2023-01-31T23:47:22Z

Integration Tests [mssql] Report

0 tests ±0 0 ✔️ ±0 0s ⏱️ ±0s
0 suites ±0 0 💤 ±0
0 files ±0 0 ❌ ±0

Results for commit aa5f866. ± Comparison against base commit adfff75.

♻️ This comment has been updated with latest results.

dotcms-sonarqube · 2023-02-07T16:16:50Z

SonarQube Quality Gate

Reliability Rating on New Code (is worse than A)
14.92% Coverage on New Code (is less than 80%)

See analysis details on SonarQube

Fix issues before they fail your Quality Gate with SonarLint in your IDE.

github-actions · 2023-03-10T02:08:39Z

This PR is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days.

github-actions · 2023-03-18T01:59:31Z

This PR was closed because it has been stalled with no activity.

jdotcms · 2024-08-23T19:10:41Z

dotCMS/src/main/java/com/dotmarketing/business/cache/provider/caffine/CaffineCache.java

+                    .recordStats()
+                    .expireAfter(new Expiry<String, Object>() {
+                        public long expireAfterCreate(String key, Object value, long currentTime) {
+                            long ttlInSeconds;


I think you can avoid an else by setting Long.MAX_VALUE here

jdotcms · 2024-08-23T19:11:07Z

dotCMS/src/main/java/com/dotmarketing/business/cache/provider/caffine/CaffineCache.java

-                            size = Config.getIntProperty("cache." + DEFAULT_CACHE + ".size", 100);
+                            if(value instanceof Expirable
+                                    && ((Expirable) value).getTtl() > 0) {
+                                ttlInSeconds = ((Expirable) value).getTtl();


my personal preference is to use Expirable.cast(value).getTtl()

jdotcms · 2024-08-23T19:11:58Z

dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexQueueAPIImpl.java

@@ -88,6 +88,29 @@ public boolean areRecordsLeftToIndex() throws DotDataException {
    public long recordsInQueue() throws DotDataException {
        return recordsInQueue(DbConnectionFactory.getConnection());
    }
+
+    @Override
+    public boolean waitForEmptyQueue(int maxWaitSeconds) throws DotDataException {


set param to final

jdotcms · 2024-08-23T19:13:03Z

dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexQueueAPIImpl.java

+        // This should be replaced with a more efficient solution that uses a notification mechanism
+        // but that would require a more complex implementation and this is required for some tests currently
+        try {
+            long recordsInQueue = recordsInQueue();


this is ok, but wondering if we cannot eventually change this kind of infinite stuff to Stream or Iterable

jdotcms · 2024-08-23T19:13:42Z

dotCMS/src/main/java/com/dotmarketing/db/DbConnectionFactory.java

@@ -269,6 +281,14 @@ public static boolean connectionExists() {
        return isCreated;
    } // connectionExists.

+    public static Optional<Throwable> getCreatorStack() {


doc it is a public method

jdotcms · 2024-08-23T19:14:27Z

dotCMS/src/main/java/com/dotmarketing/db/DbConnectionFactory.java

@@ -269,6 +281,14 @@ public static boolean connectionExists() {
        return isCreated;
    } // connectionExists.

+    public static Optional<Throwable> getCreatorStack() {
+        if (connectionExists()) {


my preference is one line return return connectionExists()? Optional.ofNullable(creatorStack.get()): Optional.empty();

jdotcms · 2024-08-23T19:16:42Z

dotCMS/src/main/java/com/dotmarketing/db/DbConnectionFactory.java

@@ -457,6 +492,10 @@ public static void closeConnection(String ds) {

    }

+    public static void setConnectionLogger(boolean connectionLogger) {


set arg to final

jdotcms · 2024-08-23T19:18:47Z

dotCMS/src/main/java/com/dotmarketing/db/HibernateUtil.java

 	/**
 	 * Attempts to find a session associated with the Thread. If there isn't a
 	 * session, it will create one.
 	 */
-	public static Session getSession() {
+	public static Session getSession(boolean createIfClosed) {


set to final arg

jdotcms · 2024-08-23T19:19:56Z

dotCMS/src/main/java/com/dotmarketing/util/Config.java

 			props.setProperty(key, value);
 		}
 	}

+	public static Map<String,String> getOverrides() {


jdotcms · 2024-08-23T19:20:04Z

dotCMS/src/main/java/com/dotmarketing/util/Config.java

+		return Map.copyOf(testOverrideTracker);
+	}
+
+	public static Map<String,String> compareOverrides(Map<String,String> before) {


doc me and set to final the arg

jdotcms · 2024-08-23T19:20:44Z

dotCMS/src/main/java/com/dotmarketing/util/Config.java

+	}
+
+	public static Map<String,String> compareOverrides(Map<String,String> before) {
+		Map<String,String> after = getOverrides();


interesting method, I think it would be a good candidate to CollectionUtils

spbolton mentioned this pull request Jan 31, 2023

global log4j config (#23631) #23632

Closed

spbolton force-pushed the issue-23631-create-global-log4j-int1 branch from 2bb3864 to 5a9ecd5 Compare February 3, 2023 02:56

dotcmsbuild added 24 commits February 3, 2023 17:06

global log4j config (#23631)

5d41202

formatting fixes

50ff092

Add null check for system property

6c108b1

Fixup null pointer and cleanup sonar lint

7235385

Fixup Caffeine cache concurrency

d29c14b

merge upstream

c422e25

fixup enterprise

e253ec7

Ensure Integration Test context available to data providers

23b2b5a

Split tests half to locate side effects-2

e1c8f81

Null pointer from hosts with null hostname during testing

5a231b1

Commit to diagnose ci build IT errors

ea4b05c

Commit to diagnose ci build IT errors

f0a1ca3

fix session connection closing

9386e49

add test log4j-test.xml

208b5b5

Ensure bytebuddy loaded when running IT tests individually

45bf080

connection logging

68a2a8a

add loging to fix test

b737129

fixup log4j-test.xml to output correct log file location

12dfe0a

add loging to fix test

7aeb208

test remove ContainerFactoryImplTest

eb37c50

More debugging for ci build, remove creation of extra default host

1cef387

More debugging for ci build, remove creation of extra default host

dfc2b16

fix config rest of SAVE_CONTENTLET_AS_JSON

bc7ab13

fix config rest of SAVE_CONTENTLET_AS_JSON

66e3d46

spbolton force-pushed the issue-23631-create-global-log4j-int1 branch from ab55184 to 66e3d46 Compare February 3, 2023 22:12

dotcmsbuild added 3 commits February 6, 2023 11:17

restore full suite

a8f65f9

await index queue empty

7d50702

Track config overrides between tests

ef29177

spbolton force-pushed the issue-23631-create-global-log4j-int1 branch from c13fd20 to ef29177 Compare February 7, 2023 01:41

#23631: docker copy fix

aa5f866

github-actions bot added the stale label Mar 10, 2023

github-actions bot closed this Mar 18, 2023

spbolton reopened this Jul 10, 2024

spbolton requested a review from a team as a code owner July 10, 2024 14:54

spbolton removed the stale label Jul 10, 2024

spbolton mentioned this pull request Jul 11, 2024

create global log4j config #23631

Closed

jdotcms reviewed Aug 23, 2024

View reviewed changes

spbolton marked this pull request as draft September 9, 2024 12:06

nollymar changed the base branch from master to main September 30, 2024 20:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue 23631 create global log4j #23964

Issue 23631 create global log4j #23964

spbolton commented Jan 31, 2023 •

edited

Loading

github-actions bot commented Jan 31, 2023 •

edited

Loading

github-actions bot commented Jan 31, 2023 •

edited

Loading

github-actions bot commented Jan 31, 2023 •

edited

Loading

github-actions bot commented Jan 31, 2023 •

edited

Loading

dotcms-sonarqube bot commented Feb 7, 2023

github-actions bot commented Mar 10, 2023

github-actions bot commented Mar 18, 2023

jdotcms Aug 23, 2024

jdotcms Aug 23, 2024

jdotcms Aug 23, 2024

jdotcms Aug 23, 2024

jdotcms Aug 23, 2024

jdotcms Aug 23, 2024

jdotcms Aug 23, 2024

jdotcms Aug 23, 2024

jdotcms Aug 23, 2024

jdotcms Aug 23, 2024

jdotcms Aug 23, 2024

jdotcms Aug 23, 2024

		@@ -457,6 +492,10 @@ public static void closeConnection(String ds) {

		}

		public static void setConnectionLogger(boolean connectionLogger) {

Issue 23631 create global log4j #23964

Are you sure you want to change the base?

Issue 23631 create global log4j #23964

Conversation

spbolton commented Jan 31, 2023 • edited Loading

github-actions bot commented Jan 31, 2023 • edited Loading

Unit Tests Report

github-actions bot commented Jan 31, 2023 • edited Loading

Postman Tests Report

github-actions bot commented Jan 31, 2023 • edited Loading

Integration Tests [postgres] Report

github-actions bot commented Jan 31, 2023 • edited Loading

Integration Tests [mssql] Report

dotcms-sonarqube bot commented Feb 7, 2023

github-actions bot commented Mar 10, 2023

github-actions bot commented Mar 18, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

spbolton commented Jan 31, 2023 •

edited

Loading

github-actions bot commented Jan 31, 2023 •

edited

Loading

github-actions bot commented Jan 31, 2023 •

edited

Loading

github-actions bot commented Jan 31, 2023 •

edited

Loading

github-actions bot commented Jan 31, 2023 •

edited

Loading