[XEN-3155] allow configuration of log levels with env variable

Author: NotAPenguin0

2repository/build.gradle

@@ -55,6 +55,12 @@ 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')
+        }
     }
 
     createDockerFile.dependsOn(parentImage)

2share/build.gradle

@@ -22,6 +22,12 @@ 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')
+        }
     }
 
     createDockerFile.dependsOn(parentImage)

tomcat-base/src/shared/main/bash/entrypoint/docker-entrypoint.d/90-logging-env-vars.sh

@@ -0,0 +1,97 @@
+#!/bin/bash
+set -e
+
+# This script generates a complete log4j configuration file based on
+# LOG_LEVEL_ environment variables and tells the Java process to use it.
+
+LOG_CONFIG_FILE="/generated-log-config.properties"
+
+echo "Generating log config at: ${LOG_CONFIG_FILE}"
+echo "Using Log4j Version: ${LOG4J_VERSION}"
+
+# Start with a clean file
+touch "${LOG_CONFIG_FILE}"
+
+# Now generate logger configs from env variables
+# We need to pre-process for log4j2's 'loggers = name1,name2' syntax
+logger_list=""
+logger_configs=""
+
+for var in $(env); do
+  if echo "$var" | grep -q "^LOG_LEVEL_"; then
+    var_name=$(echo "$var" | cut -d= -f1)
+    var_value=$(echo "$var" | cut -d= -f2)
+
+    # Convert LOG_LEVEL_org_alfresco -> org.alfresco
+    logger_name=$(echo "$var_name" | sed 's/LOG_LEVEL_//' | sed 's/_/./g')
+
+    if [ -n "$logger_name" ] && [ -n "$var_value" ]; then
+      echo "Applying log level: ${logger_name}=${var_value}"
+
+      if [ "$LOG4J_VERSION" = "1" ]; then
+        # Log4j 1.x syntax
+        logger_configs="${logger_configs}log4j.logger.${logger_name}=${var_value}\n"
+      else
+        # Log4j 2.x syntax
+        logger_list="${logger_list}${logger_name},"
+        # Add the logger definition
+        logger_configs="${logger_configs}logger.${logger_name}.name = ${logger_name}\n"
+        logger_configs="${logger_configs}logger.${logger_name}.level = ${var_value}\n"
+      fi
+    fi
+  fi
+done
+
+# Add default appender and root configuration
+# TODO: Specify a base configuration file somewhere in the project instead and use that
+
+if [ "$LOG4J_VERSION" = "1" ]; then
+  # --- Log4j 1.x Config ---
+  echo "Generating Log4j config."
+  echo "# Auto-generated Log4j 1.x config" >> "${LOG_CONFIG_FILE}"
+
+  # Add a basic console appender
+  echo "log4j.rootLogger = WARN, CONSOLE" >> "${LOG_CONFIG_FILE}"
+  echo "log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender" >> "${LOG_CONFIG_FILE}"
+  echo "log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout" >> "${LOG_CONFIG_FILE}"
+  echo "log4j.appender.CONSOLE.layout.ConversionPattern = %d{ISO8601} [%t] %-5p %c - %m%n" >> "${LOG_CONFIG_FILE}"
+
+  # Add the custom loggers
+  echo -e "\n# Custom Log Levels" >> "${LOG_CONFIG_FILE}"
+  echo -e "${logger_configs}" >> "${LOG_CONFIG_FILE}"
+
+  # Tell Java to use this file
+  JAVA_OPTS="$JAVA_OPTS -Dlog4j.configuration=file://${LOG_CONFIG_FILE}"
+else
+  # --- Log4j 2.x Config ---
+  echo "# Auto-generated Log4j 2.x config" >> "${LOG_CONFIG_FILE}"
+
+  # Add a basic console appender
+  echo "appenders = console" >> "${LOG_CONFIG_FILE}"
+  echo "appender.console.type = Console" >> "${LOG_CONFIG_FILE}"
+  echo "appender.console.name = STDOUT" >> "${LOG_CONFIG_FILE}"
+  echo "appender.console.layout.type = PatternLayout" >> "${LOG_CONFIG_FILE}"
+  echo "appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c - %m%n" >> "${LOG_CONFIG_FILE}"
+
+  # Add root logger
+  echo "rootLogger.level = WARN" >> "${LOG_CONFIG_FILE}"
+  echo "rootLogger.appenderRefs = console" >> "${LOG_CONFIG_FILE}"
+  echo "rootLogger.appenderRef.console.ref = STDOUT" >> "${LOG_CONFIG_FILE}"
+
+  # Add the custom loggers
+  echo -e "\n# Custom Log Levels" >> "${LOG_CONFIG_FILE}"
+  if [ -n "$logger_list" ]; then
+    # Add the 'loggers = name1,name2' list (stripping last comma)
+    echo "loggers = ${logger_list%,}" >> "${LOG_CONFIG_FILE}"
+    # Add the logger definitions
+    echo -e "${logger_configs}" >> "${LOG_CONFIG_FILE}"
+  fi
+
+  # Tell Java to use this file
+  JAVA_OPTS="$JAVA_OPTS -Dlog4j.configurationFile=${LOG_CONFIG_FILE}"
+fi
+
+# Export new Java options with updated log config
+export JAVA_OPTS
+
+echo "Log configuration complete. JAVA_OPTS updated."