GRP-3325: harmonize container log4j and host log4j properties

docker · Mar 30, 2021 · 7fe710a · 7fe710a
1 parent 7c15b77
commit 7fe710a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 92 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ RUN yum update -y \
 RUN yum install -y wget tar unzip dos2unix patch
 
 ARG GROUPER_CONTAINER_VERSION
-ENV GROUPER_VERSION=2.5.47 \
+ENV GROUPER_VERSION=2.5.48 \
      GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
 
 # Install Corretto Java JDK
@@ -32,7 +32,7 @@ RUN echo 'Installing Grouper'; \
     cd /opt/grouper/$GROUPER_VERSION/ \
     && $JAVA_HOME/bin/java -cp :grouperInstaller.jar edu.internet2.middleware.grouperInstaller.GrouperInstaller
 FROM centos:centos7 as cleanup
-ENV GROUPER_VERSION=2.5.47 \
+ENV GROUPER_VERSION=2.5.48 \
     TOMEE_VERSION=7.0.0
 RUN mkdir -p /opt/grouper/grouperWebapp/
 RUN mkdir -p /opt/tomee/

diff --git a/container_files/api/log4j.properties b/container_files/api/log4j.properties
@@ -26,36 +26,25 @@
 
 # Appenders
 
-## Grouper API event logging
-log4j.appender.grouper_event                            = org.apache.log4j.FileAppender
-log4j.appender.grouper_event.file                       = /tmp/logpipe
-log4j.appender.grouper_event.append                     = true
-log4j.appender.grouper_event.layout                     = org.apache.log4j.PatternLayout
-log4j.appender.grouper_event.layout.ConversionPattern   = __GROUPER_LOG_PREFIX__;grouper_event.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
-
 ## Grouper API error logging
 log4j.appender.grouper_error                            = org.apache.log4j.FileAppender
 log4j.appender.grouper_error.file                       = /tmp/logpipe
-log4j.appender.grouper_errot.append                     = true
+log4j.appender.grouper_error.append                     = true
 log4j.appender.grouper_error.layout                     = org.apache.log4j.PatternLayout
 log4j.appender.grouper_error.layout.ConversionPattern   = __GROUPER_LOG_PREFIX__;grouper_error.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
 #log4j.appender.grouper_error.layout.ConversionPattern   = %d{ISO8601}: %m%n
 
-# Debug logging (Or: logging that I haven't cleaned up yet to send elsewhere)
-log4j.appender.grouper_debug                            = org.apache.log4j.FileAppender
-log4j.appender.grouper_debug.file                       = /tmp/logpipe
-log4j.appender.grouper_debug.append                     = true
-log4j.appender.grouper_debug.layout                     = org.apache.log4j.PatternLayout
-#log4j.appender.grouper_debug.layout.ConversionPattern   = %d{ISO8601} %5p %c{2}: %m%n
-log4j.appender.grouper_debug.layout.ConversionPattern   = __GROUPER_LOG_PREFIX__;grouper_debug.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
-
-## Benchmark logging
-log4j.appender.grouper_gb                               = org.apache.log4j.FileAppender
-log4j.appender.grouper_gb.file                          = /tmp/logpipe
-log4j.appender.grouper_gb.append                        = true
-log4j.appender.grouper_gb.layout                        = org.apache.log4j.PatternLayout
-#log4j.appender.grouper_gb.layout.ConversionPattern      = %d{ISO8601} %5p %c{2}: %m%n
-log4j.appender.grouper_gb.layout.ConversionPattern      = __GROUPER_LOG_PREFIX__;grouper_bench.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
+log4j.appender.grouper_daemon = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.grouper_daemon.File = /tmp/logpipe
+log4j.appender.grouper_daemon.append = true
+log4j.appender.grouper_daemon.layout = org.apache.log4j.PatternLayout
+log4j.appender.grouper_daemon.layout.ConversionPattern = __GROUPER_LOG_PREFIX__;grouperDaemon.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
+
+log4j.appender.grouper_pspng = org.apache.log4j.FileAppender
+log4j.appender.grouper_pspng.File = /tmp/logpipe
+log4j.appender.grouper_pspng.append = true
+log4j.appender.grouper_pspng.layout = org.apache.log4j.PatternLayout
+log4j.appender.grouper_pspng.layout.ConversionPattern = __GROUPER_LOG_PREFIX__;pspng.log;${ENV};${USERTOKEN};%d{ISO8601}: [%t] %-5p %C{1}.%M(%L) - %x - %m%n
 
 log4j.appender.grouper_provisioning                               = org.apache.log4j.FileAppender
 log4j.appender.grouper_provisioning.file                          = /tmp/logpipe
@@ -67,78 +56,21 @@ log4j.appender.grouper_provisioning.layout.ConversionPattern      = __GROUPER_LO
 # Loggers
 
 ## Default logger; will log *everything*
-log4j.rootLogger  = ERROR, grouper_error
-
-## All Internet2 (warn to grouper_error per default logger)
-log4j.logger.edu.internet2.middleware = WARN
+log4j.rootLogger  = WARN, grouper_error
 
+log4j.logger.edu = ERROR
+log4j.logger.com = ERROR
+log4j.logger.org = ERROR
 
-# Provisioning : PSP (version 2.1+)
-log4j.logger.edu.internet2.middleware.psp = INFO
+log4j.logger.edu.internet2.middleware.grouper.app.loader.GrouperLoaderLog = DEBUG, grouper_daemon
+log4j.additivity.edu.internet2.middleware.grouper.app.loader.GrouperLoaderLog = false
+
+log4j.logger.edu.internet2.middleware.grouper.pspng = INFO, grouper_pspng
+log4j.additivity.edu.internet2.middleware.grouper.pspng = false
 
 log4j.logger.edu.internet2.middleware.grouper.app.provisioning.GrouperProvisioningObjectLog = DEBUG, grouper_provisioning
 log4j.additivity.edu.internet2.middleware.grouper.app.provisioning.GrouperProvisioningObjectLog = false
 
-# Provisioning : vt-ldap
-# log4j.logger.edu.vt.middleware.ldap = INFO
-
-# Provisioning : Grouper plugin to Shibboleth attribute resolver
-# log4j.logger.edu.internet2.middleware.grouper.shibboleth = INFO
-
-
-# For more precise (or verbose) logging, enable one or more of the
-# following logging directives.  To remove duplicate entries, just change the 
-# level, and not where to send the logs
-# http://robertmarkbramprogrammer.blogspot.com/2007/06/log4j-duplicate-lines-in-output.html
-
-## Grouper Event Logging
-## * Logs at _info_ only
-log4j.logger.edu.internet2.middleware.grouper.log.EventLog        = INFO, grouper_event
-log4j.logger.edu.internet2.middleware.grouper.RegistryInstall = INFO, grouper_event
-
-## Grouper Error Logging
-## * Logs at _warn_, _fatal_ and _error_ only (by default this is WARN due to internet2 below)
-#log4j.logger.edu.internet2.middleware.grouper              = WARN, grouper_error
-
-## Grouper Debug Logging
-## * NOTE: There is currently VERY LITTLE (useful) information sent to this.
-## * Logs at _info_ only currently
-#log4j.logger.edu.internet2.middleware.grouper              = INFO, grouper_debug
-
-## Grouper XML Export + Import Logging
-## TODO Integrate with normal logging
-log4j.logger.edu.internet2.middleware.grouper.xml.XmlExporter           = INFO, grouper_event
-log4j.logger.edu.internet2.middleware.grouper.xml.XmlImporter           = INFO, grouper_event
-
-## Grouper Benchmark Logging
-log4j.logger.edu.internet2.middleware.grouper.bench                 = INFO, grouper_gb
-
-## Grouper script to add missing group sets
-log4j.logger.edu.internet2.middleware.grouper.misc.AddMissingGroupSets   = INFO, grouper_event
-
-## Grouper Sync Point in Time Tables
-log4j.logger.edu.internet2.middleware.grouper.misc.SyncPITTables   = INFO, grouper_event
-
-## Grouper Sync Stem Set Table
-log4j.logger.edu.internet2.middleware.grouper.misc.SyncStemSets      = INFO, grouper_event
-
-## Grouper Migrate Legacy Attributes
-log4j.logger.edu.internet2.middleware.grouper.misc.MigrateLegacyAttributes = INFO, grouper_event
-
-### Subject API
-#log4j.logger.edu.internet2.middleware.subject                       = ERROR, grouper_error
-#log4j.logger.edu.internet2.middleware.subject.provider              = ERROR, grouper_error
-### Hibernate 
-#log4j.logger.org.hibernate                                          = ERROR, grouper_error
-### ehcache
-#log4j.logger.net.sf.ehcache                                         = ERROR, grouper_error
-### Spring
-#log4j.logger.org.springframework                                    = ERROR, grouper_error
-
-## Grouper Stress Testing
-log4j.logger.edu.internet2.middleware.grouper.stress                = INFO, grouper_debug
-
-
 log4j.logger.edu.internet2.middleware.grouper.app.syncToGrouper.SyncToGrouperFromSqlDaemon = DEBUG
 
 #######################################################

diff --git a/container_files/tier-support/test/grouperContainerUnitTest.sh b/container_files/tier-support/test/grouperContainerUnitTest.sh
@@ -5,7 +5,7 @@ if [ "$#" -ne 4 ]; then
   exit 1
 fi
 
-expectedSuccesses=710
+expectedSuccesses=712
 
 export containerName=$1
 export imageName=$2