Merge branch 'dev/rc9.3'

deploy/lib/log4j2.properties

@@ -1,11 +1,11 @@
 # Root logger configuration
-rootLogger.level = warn 
-rootLogger.appenderRefs = stdout, catalina 
+rootLogger.level = warn
+rootLogger.appenderRefs = stdout, catalina
 rootLogger.appenderRef.stdout.ref = STDOUT
-rootLogger.appenderRef.catalina.ref = CATALINA 
+rootLogger.appenderRef.catalina.ref = CATALINA
 
 appender.catalina.type = RollingFile
-appender.catalina.name = CATALINA 
+appender.catalina.name = CATALINA
 appender.catalina.fileName = logs/nbia2.log
 appender.catalina.filePattern = logs/nbia2-%d{yyyy-MM-dd}.log
 appender.catalina.append = true
@@ -23,33 +23,110 @@ appender.stdout.name = STDOUT
 appender.stdout.layout.type = PatternLayout
 appender.stdout.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
 
-# Logger configuration for logger2
-logger.logger2.name = logger2
-logger.logger2.level = DOWNLOADLOG 
-logger.logger2.additivity = false
-logger.logger2.appenderRefs = file
-logger.logger2.appenderRef.file.ref = FILE
-
-# Appender configuration for file output
-appender.file.type = RollingFile
-appender.file.name = FILE
-appender.file.fileName = logs/download2.log
-appender.file.filePattern = logs/download2-%d{yyyy-MM-dd}.log
-appender.file.append = true
-appender.file.layout.type = PatternLayout
-appender.file.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
-appender.file.policies.type = Policies
-appender.file.policies.time.type = TimeBasedTriggeringPolicy
-appender.file.policies.time.interval = 1
-appender.file.policies.time.modulate = true
-appender.file.encoding = UTF-8
-
-logger.LDAPSyncRPT.name = LDAPSyncRPT
-logger.LDAPSyncRPT.level = INFO
-logger.LDAPSyncRPT.additivity = false
-logger.LDAPSyncRPT.appenderRefs = ldapsyncrpt
-logger.LDAPSyncRPT.appenderRef.ldapsyncrpt.ref = LDAPSYNCRPT
-#logger.ldapsyncrpt.appenderRef.stdout.ref = STDOUT 
+# Logger configuration for logger2API
+logger.logger2API.name = logger2API
+logger.logger2API.level = info
+logger.logger2API.additivity = false
+logger.logger2API.appenderRefs = fileapi
+logger.logger2API.appenderRef.file.ref = FILEAPI
+
+# Logger configuration for logger2DR
+logger.logger2DR.name = logger2DR
+logger.logger2DR.level = info
+logger.logger2DR.additivity = false
+logger.logger2DR.appenderRefs = filedr
+logger.logger2DR.appenderRef.file.ref = FILEDR
+
+# Appender configuration for file-API  output
+appender.fileapi.type = RollingFile
+appender.fileapi.name = FILEAPI
+appender.fileapi.fileapiName = logs/download2-API.log
+appender.fileapi.fileapiPattern = logs/download2-API-%d{yyyy-MM-dd}.log
+appender.fileapi.append = true
+appender.fileapi.layout.type = PatternLayout
+appender.fileapi.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+appender.fileapi.policies.type = Policies
+appender.fileapi.policies.time.type = TimeBasedTriggeringPolicy
+appender.fileapi.policies.time.interval = 1
+appender.fileapi.policies.time.modulate = true
+appender.fileapi.encoding = UTF-8
+
+# Appender configuration for file-DR output
+appender.filedr.type = RollingFile
+appender.filedr.name = FILEDR
+appender.filedr.filedrName = logs/download2-DR.log
+appender.filedr.filedrPattern = logs/download2-DR-%d{yyyy-MM-dd}.log
+appender.filedr.append = true
+appender.filedr.layout.type = PatternLayout
+appender.filedr.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+appender.filedr.policies.type = Policies
+appender.filedr.policies.time.type = TimeBasedTriggeringPolicy
+appender.filedr.policies.time.interval = 1
+appender.filedr.policies.time.modulate = true
+appender.filedr.encoding = UTF-8
+
+#Entries of this form currently do not work.
+#Need to correctly translate from log4j1 syntax
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].name = org.apache.catalina.core.ContainerBase.[Catalina].[localhost]
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = debug
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].appenderRefs = localhost
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].appenderRef.localhost.ref = LOCALHOST
+
+appender.localhost.type = RollingFile
+appender.localhost.name = LOCALHOST
+appender.localhost.fileName = logs/localhost2.log
+appender.localhost.filePattern = logs/localhost2-%d{yyyy-MM-dd}.log
+appender.localhost.append = true
+appender.localhost.layout.type = PatternLayout
+appender.localhost.layout.pattern = %d [%t] %-5p %c- %m%n
+appender.localhost.policies.type = Policies
+appender.localhost.policies.time.type = TimeBasedTriggeringPolicy
+appender.localhost.policies.time.interval = 1
+appender.localhost.policies.time.modulate = true
+appender.localhost.encoding = UTF-8
+
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].name = org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager]
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = debug
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].appenderRefs = manager
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].appenderRef.manager.ref = MANAGER
+
+appender.manager.type = RollingFile
+appender.manager.name = MANAGER
+appender.manager.fileName = logs/manager2.log
+appender.manager.filePattern = logs/manager2-%d{yyyy-MM-dd}.log
+appender.manager.append = true
+appender.manager.layout.type = PatternLayout
+appender.manager.layout.pattern = %d [%t] %-5p %c- %m%n
+appender.manager.policies.type = Policies
+appender.manager.policies.time.type = TimeBasedTriggeringPolicy
+appender.manager.policies.time.interval = 1
+appender.manager.policies.time.modulate = true
+appender.manager.encoding = UTF-8
+
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].name = org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager]
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = debug
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].appenderRefs = hostmanager
+#logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].appenderRef.hostmanager.ref = HOSTMANAGER
+
+appender.hostmanager.type = RollingFile
+appender.hostmanager.name = HOSTMANAGER
+appender.hostmanager.fileName = logs/host-manager2.log
+appender.hostmanager.filePattern = logs/host-manager2-%d{yyyy-MM-dd}.log
+appender.hostmanager.append = true
+appender.hostmanager.layout.type = PatternLayout
+appender.hostmanager.layout.pattern = %d [%t] %-5p %c- %m%n
+appender.hostmanager.policies.type = Policies
+appender.hostmanager.policies.time.type = TimeBasedTriggeringPolicy
+appender.hostmanager.policies.time.interval = 1
+appender.hostmanager.policies.time.modulate = true
+appender.hostmanager.encoding = UTF-8
+
+logger.ldapsyncrpt.name = LDAPSyncRPT
+logger.ldapsyncrpt.level = INFO
+logger.ldapsyncrpt.additivity = false
+logger.ldapsyncrpt.appenderRefs = ldapsyncrpt, stdout
+logger.ldapsyncrpt.appenderRef.ldapsyncrpt.ref = LDAPSYNCRPT
+logger.ldapsyncrpt.appenderRef.stdout.ref = STDOUT
 
 appender.ldapsyncrpt.type = RollingFile
 appender.ldapsyncrpt.name = LDAPSYNCRPT
@@ -70,3 +147,7 @@ logger.NonCTPDatabaseDelegator.additivity = false
 logger.NonCTPDatabaseDelegator.appenderRefs = stdout
 logger.NonCTPDatabaseDelegator.appenderRef.stdout.ref = STDOUT
 
+#logger.org.apache.solr.name = org.apache.solr
+#logger.org.apache.solr.level = info
+#logger.org.apache.solr.appenderRefs = stdout
+#logger.org.apache.solr.appenderRef.stdout.ref = STDOUT