Skip to content
Open
9 changes: 9 additions & 0 deletions 2repository/23.1/community-23.1.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2repository/23.1/enterprise-23.1.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2repository/23.2/community-23.2.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2repository/23.2/enterprise-23.2.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2repository/23.3/community-23.3.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2repository/23.3/enterprise-23.3.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2repository/23.4/community-23.4.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2repository/23.4/enterprise-23.4.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2repository/25.1/community-25.1.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2repository/25.1/enterprise-25.1.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
4 changes: 4 additions & 0 deletions 2repository/7.0/community-7.0.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
4 changes: 4 additions & 0 deletions 2repository/7.0/enterprise-7.0.1/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
4 changes: 4 additions & 0 deletions 2repository/7.1/community-7.1.1/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
4 changes: 4 additions & 0 deletions 2repository/7.1/enterprise-7.1.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
4 changes: 4 additions & 0 deletions 2repository/7.2/community-7.2.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
4 changes: 4 additions & 0 deletions 2repository/7.2/enterprise-7.2.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
4 changes: 4 additions & 0 deletions 2repository/7.3/community-7.3.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
4 changes: 4 additions & 0 deletions 2repository/7.3/enterprise-7.3.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
9 changes: 9 additions & 0 deletions 2repository/7.4/community-7.4.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2repository/7.4/enterprise-7.4.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
8 changes: 8 additions & 0 deletions 2repository/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ subprojects {

environmentVariable('ALFRESCO_FLAVOR', "${project.alfresco.flavor}")
environmentVariable('ALFRESCO_VERSION', "${project.alfresco.version.major}.${project.alfresco.version.minor}.${project.alfresco.version.rev}")

if (project.alfresco.version.major == 7 && project.alfresco.version.minor <= 3) {
environmentVariable('LOG4J_VERSION', '1')
} else {
environmentVariable('LOG4J_VERSION', '2')
}

smartCopy(file("${project.projectDir}/resources/log4j.properties"), "/log4j.properties.base")
}

createDockerFile.dependsOn(parentImage)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package eu.xenit.docker.alfresco.test;

import java.io.IOException;
import java.time.Duration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -63,15 +65,17 @@ private boolean validateApplicationJsonLog(Stream<JsonNode> jsonNodes) {
.allMatch(logLine -> REQ_APPLICATION_LOGGING_FIELDS.stream().allMatch(logLine::has));
}

private void setupAlfrescoTestContainer(GenericContainer<?> alfContainer, boolean jsonLogging) {
alfContainer
.withExposedPorts(8080)
.withEnv(Map.of(
private void setupAlfrescoTestContainer(GenericContainer<?> alfContainer, boolean jsonLogging, Map<String, String> env) {
Map<String, String> baseEnv = new HashMap<>(Map.of(
"ACCESS_LOGGING", "false",
"GLOBAL_legacy.transform.service.enabled", "false",
"GLOBAL_local.transform.service.enabled", "false",
"JSON_LOGGING", String.valueOf(jsonLogging)
));
));
baseEnv.putAll(env);
alfContainer
.withExposedPorts(8080)
.withEnv(baseEnv);
}

private static DockerImageName getAlfrescoImageName() {
Expand All @@ -89,10 +93,16 @@ private boolean isJsonLogs(String logs) {

}

private boolean containsSpringDebugLog(String logs) {
return logs.lines().anyMatch(line -> {
return line.contains("DEBUG org.springframework");
});
}

@Test
public void testNonJsonLogging() {
try (GenericContainer<?> alfContainer = new GenericContainer<>(getAlfrescoImageName())) {
setupAlfrescoTestContainer(alfContainer, false);
setupAlfrescoTestContainer(alfContainer, false, Map.of());
alfContainer.start();

// Let the logs accumulate
Expand All @@ -107,7 +117,7 @@ public void testNonJsonLogging() {
@Test
public void testJsonLogging() {
try (GenericContainer<?> alfContainer = new GenericContainer<>(getAlfrescoImageName())) {
setupAlfrescoTestContainer(alfContainer, true);
setupAlfrescoTestContainer(alfContainer, true, Map.of());
alfContainer.start();

// Let the logs accumulate
Expand All @@ -121,4 +131,21 @@ public void testJsonLogging() {
Assert.assertTrue(validateApplicationJsonLog(jsonNodes));
}
}

@Test
public void testLogLevelConfiguration() {
try (GenericContainer<?> alfContainer = new GenericContainer<>(getAlfrescoImageName())) {
// Start container with debug Spring
setupAlfrescoTestContainer(alfContainer, false, Map.of("LOG_LEVEL_org_springframework", "debug"));
alfContainer.start();

// Accumulate some logs (make sure we get enough to catch some Spring logs)
Awaitility.await().timeout(Duration.ofMinutes(1)).until(() -> alfContainer.getLogs().lines().count() > 50);

String logs = alfContainer.getLogs();

// Now find log entries from Spring marked as Debug
Assert.assertTrue(containsSpringDebugLog(logs));
}
}
}
9 changes: 9 additions & 0 deletions 2share/23.1/community-23.1.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2share/23.2/community-23.2.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2share/23.3/community-23.3.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2share/23.4/community-23.4.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
9 changes: 9 additions & 0 deletions 2share/25.1/community-25.1.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
4 changes: 4 additions & 0 deletions 2share/7.0/community-7.0.1/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
4 changes: 4 additions & 0 deletions 2share/7.1/community-7.1.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
4 changes: 4 additions & 0 deletions 2share/7.2/community-7.2.1/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
4 changes: 4 additions & 0 deletions 2share/7.3/community-7.3.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
log4j.rootLogger = WARN, CONSOLE
log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n
9 changes: 9 additions & 0 deletions 2share/7.4/community-7.4.0/resources/log4j.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
appenders = console
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n

rootLogger.level = WARN
rootLogger.appenderRefs = console
rootLogger.appenderRef.console.ref = STDOUT
8 changes: 8 additions & 0 deletions 2share/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ subprojects {
createDockerFile {
environmentVariable('SHARE_FLAVOR', "${project.share.flavor}")
environmentVariable('SHARE_VERSION', "${project.share.version.major}.${project.share.version.minor}.${project.share.version.rev}")

if (project.share.version.major == 7 && project.share.version.minor <= 3) {
environmentVariable('LOG4J_VERSION', '1')
} else {
environmentVariable('LOG4J_VERSION', '2')
}

smartCopy(file("${project.projectDir}/resources/log4j.properties"), "/log4j.properties.base")
}

createDockerFile.dependsOn(parentImage)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ in the following tables, are the values that are used when the environment varia
| JMX_ENABLED | false | -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.rmi.port=5000 -Dcom.sun.management.jmxremote.port=5000 -Djava.rmi.server.hostname=$JMX_RMI_HOST |
| JMX_RMI_HOST | 0.0.0.0 | |
| JAVA_OPTS_\<variable\>=\<value\> | \<value\> | \<variable\> |
| LOG_LEVEL_\<org_package_name\>=\<value\> | | Sets the log level for org.package.name to the provided value |
| JSON_LOGGING | false | When true, all logs will be in JSON. |
| ACCESS_LOGGING | false | When true, access logs will be printed. These logs are always in JSON format |
| EXIT_ON_FAILURE | true | When true, the Java process will exit when the application deployed in Tomcat fails to start. Can be turned of for debugging purposes. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fi
IFS=$'\n'
for I in $(env); do
if [[ $I == JAVA_OPTS_* ]]; then
echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : "' "-- collecting $I" '"}'
echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "entrypoint","component" : "docker-entrypoint" ,"fullMessage" : "' "-- collecting $I" '"}'
VALUE=$(echo $I | cut -d '=' -f 2-)
JAVA_OPTS="$JAVA_OPTS $VALUE"
fi
Expand All @@ -43,4 +43,4 @@ done
# Trim leading/trailing whitespace
export JAVA_OPTS=$(echo $JAVA_OPTS | xargs echo)

echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "application","component" : "docker-entrypoint" ,"fullMessage" : "' "Result: JAVA_OPTS=${JAVA_OPTS}" '"}'
echo '{ "timestamp" : '"$(date '+%s')"' ,"severity" : "INFO", "type" : "entrypoint","component" : "docker-entrypoint" ,"fullMessage" : "' "Result: JAVA_OPTS=${JAVA_OPTS}" '"}'
Loading
Loading