From 401a8806869ba316da625b842af33439b70c3a9a Mon Sep 17 00:00:00 2001
From: Richard Peter <richard.peter@raytheon.com>
Date: Fri, 2 May 2014 16:28:09 -0500
Subject: [PATCH] Omaha #2782: Update thread based logging

Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8

Former-commit-id: d5ec01f7c0a6b02e214cb69b84e6f8d80c788384 [formerly d5ec01f7c0a6b02e214cb69b84e6f8d80c788384 [formerly fe464020d287bbf21b7bc04402d31c97114c195b]]
Former-commit-id: adff7b5684b160025364f848d4ba4d121369f803
Former-commit-id: 7a7b65860be3fd841c6ea5a9e4a944ef88837d7c
---
 .../build.edex/esb/conf/logback-ingest.xml    | 89 +++----------------
 .../res/spring/gfe-spring.xml                 |  4 +
 .../res/spring/radar-ingest.xml               |  5 ++
 .../res/spring/satellite-ingest.xml           |  5 ++
 .../res/spring/shef-ingest.xml                |  4 +
 .../res/spring/text-ingest.xml                |  6 +-
 .../res/spring/archive-spring.xml             |  4 +
 .../res/spring/regionalsat-ingest.xml         |  7 +-
 8 files changed, 46 insertions(+), 78 deletions(-)

diff --git a/edexOsgi/build.edex/esb/conf/logback-ingest.xml b/edexOsgi/build.edex/esb/conf/logback-ingest.xml
index 9bf2310f1e..3c6677418a 100644
--- a/edexOsgi/build.edex/esb/conf/logback-ingest.xml
+++ b/edexOsgi/build.edex/esb/conf/logback-ingest.xml
@@ -22,32 +22,8 @@
       </encoder>
    </appender>
 
-   <!-- radar log --> 
-   <appender name="RadarLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-         <fileNamePattern>${edex.home}/logs/edex-${edex.run.mode}-radar-%d{yyyyMMdd}.log</fileNamePattern>
-         <maxHistory>30</maxHistory>
-      </rollingPolicy> 
-
-      <encoder> 
-         <pattern>%-5p %d [%t] %c{0}: %m%n</pattern> 
-      </encoder>
-   </appender> 
-
-   <!-- satellite log --> 
-   <appender name="SatelliteLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-         <fileNamePattern>${edex.home}/logs/edex-${edex.run.mode}-satellite-%d{yyyyMMdd}.log</fileNamePattern>
-         <maxHistory>30</maxHistory>
-      </rollingPolicy> 
-
-      <encoder> 
-         <pattern>%-5p %d [%t] %c{0}: %m%n</pattern> 
-      </encoder>
-   </appender> 
-
    <!-- shef log --> 
-   <appender name="ShefLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+   <appender name="shef" class="ch.qos.logback.core.rolling.RollingFileAppender">
       <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
          <fileNamePattern>${edex.home}/logs/edex-${edex.run.mode}-shef-%d{yyyyMMdd}.log</fileNamePattern>
          <maxHistory>30</maxHistory>
@@ -58,20 +34,8 @@
       </encoder>
    </appender> 
 
-   <!-- smartInit log --> 
-   <appender name="SmartInitLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-         <fileNamePattern>${edex.home}/logs/edex-${edex.run.mode}-smartInit-%d{yyyyMMdd}.log</fileNamePattern>
-         <maxHistory>30</maxHistory>
-      </rollingPolicy> 
-
-      <encoder> 
-         <pattern>%-5p %d [%t] %c{0}: %m%n</pattern> 
-      </encoder>
-   </appender> 
-      
    <!-- Purge log --> 
-   <appender name="PurgeLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+   <appender name="purge" class="ch.qos.logback.core.rolling.RollingFileAppender">
       <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
          <fileNamePattern>${edex.home}/logs/edex-${edex.run.mode}-purge-%d{yyyyMMdd}.log</fileNamePattern>
          <maxHistory>30</maxHistory>
@@ -82,18 +46,6 @@
       </encoder>
    </appender> 
    
-   <!-- Archive log --> 
-   <appender name="ArchiveLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-         <fileNamePattern>${edex.home}/logs/edex-${edex.run.mode}-archive-%d{yyyyMMdd}.log</fileNamePattern>
-         <maxHistory>30</maxHistory>
-      </rollingPolicy> 
-
-      <encoder> 
-         <pattern>%-5p %d [%t] %c{0}: %m%n</pattern> 
-      </encoder>
-   </appender> 
-
    <!-- RouteFailedLog log --> 
    <appender name="RouteFailedLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
       <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -141,18 +93,6 @@
       </encoder>
    </appender> 
    
-   <!-- Text log --> 
-   <appender name="TextLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-         <fileNamePattern>${edex.home}/logs/edex-${edex.run.mode}-text-%d{yyyyMMdd}.log</fileNamePattern>
-         <maxHistory>30</maxHistory>
-      </rollingPolicy> 
-
-      <encoder> 
-         <pattern>%-5p %d [%t] %c{0}: %m%n</pattern> 
-      </encoder>
-   </appender> 
-
    <!-- Trigger log --> 
    <appender name="FailedTriggerLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
       <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -178,16 +118,13 @@
    </appender>
 
    <appender name="ThreadBasedLog" class="com.raytheon.uf.common.status.logback.ThreadBasedAppender">
-      <threadPatterns>RadarLog:Ingest.Radar.*;SatelliteLog:Ingest.Satellite.*;ShefLog:Ingest.Shef.*;TextLog:Ingest.Text.*;SmartInitLog:smartInit.*;PurgeLog:Purge.*;ArchiveLog:Archive.*</threadPatterns>
-      <defaultAppender>asyncConsole</defaultAppender>
+      <maxHistory>30</maxHistory>
+      <patternLayout>%-5p %d [%t] %c{0}: %m%n</patternLayout>
+      <fileNameBase>${edex.home}/logs/edex-${edex.run.mode}-%s{name}-%d{yyyyMMdd}.log</fileNameBase>
+      <defaultAppenderName>asyncConsole</defaultAppenderName>
       <appender-ref ref="asyncConsole"/>
-      <appender-ref ref="RadarLog"/>
-      <appender-ref ref="SatelliteLog"/>
-      <appender-ref ref="ShefLog"/>
-      <appender-ref ref="SmartInitLog"/>
-      <appender-ref ref="TextLog"/>
-      <appender-ref ref="PurgeLog"/>
-      <appender-ref ref="ArchiveLog"/>
+      <appender-ref ref="shef"/>
+      <appender-ref ref="purge"/>
    </appender>
 
    <appender name="PerformanceLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -214,7 +151,7 @@
    </logger>
    <logger name="com.raytheon.edex.plugin.shef" additivity="false">
       <level value="INFO"/>
-      <appender-ref ref="ShefLog" />
+      <appender-ref ref="shef" />
    </logger>
    <logger name="com.raytheon.edex.services.ArchiveSrv">
       <level value="WARN"/>
@@ -273,22 +210,22 @@
    
    <logger name="com.raytheon.uf.edex.purgesrv" additivity="false">
    		<level value="INFO"/>
-   		<appender-ref ref="PurgeLog"/>
+   		<appender-ref ref="purge"/>
    </logger>
    
    <logger name="com.raytheon.uf.edex.database.purge" additivity="false">
    		<level value="INFO"/>
-   		<appender-ref ref="PurgeLog"/>
+   		<appender-ref ref="purge"/>
    </logger>
    
    <logger name="com.raytheon.edex.db.purge.DataPurgeRegistry" additivity="false">
    		<level value="INFO"/>
-   		<appender-ref ref="PurgeLog"/>
+   		<appender-ref ref="purge"/>
    </logger>
 
    <logger name="com.raytheon.edex.textdb.dao.StdTextProductDao.PurgeLogger" additivity="false">
    		<level value="INFO"/>
-   		<appender-ref ref="PurgeLog"/>
+   		<appender-ref ref="purge"/>
    </logger>
    
    <logger name="RouteFailedLog" additivity="false">
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
index c41d88919f..88ed5393f0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
@@ -2,6 +2,10 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+        <constructor-arg value="smartInit" />
+        <constructor-arg value="smartInit.*" />
+    </bean>
 
     <bean id="smartInitQueue" class="com.raytheon.edex.plugin.gfe.smartinit.SmartInitQueue" factory-method="createQueue"/>
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
index 8e74801709..d5c429776b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
@@ -3,6 +3,11 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
+    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+        <constructor-arg value="radar" />
+        <constructor-arg value="Ingest.Radar.*" />
+    </bean>
+
 	<bean id="radarDecompressor" class="com.raytheon.edex.plugin.radar.RadarDecompressor"/>
 	<bean id="radarDecoder" class="com.raytheon.edex.plugin.radar.RadarDecoder"/>
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
index 5332721bff..e4661cf6e4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
@@ -3,6 +3,11 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
+    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+        <constructor-arg value="satellite" />
+        <constructor-arg value="Ingest.Satellite.*" />
+    </bean>
+
 	<bean id="satelliteDecoder" class="com.raytheon.edex.plugin.satellite.SatelliteDecoder">
 		<property name="dao" ref="satelliteDao" />
 	</bean>
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
index e63a4bf572..2d96965925 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
@@ -2,6 +2,10 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+        <constructor-arg value="shef" />
+        <constructor-arg value="Ingest.Shef.*" />
+    </bean>
 
 	<bean id="shefDecoder" class="com.raytheon.edex.plugin.shef.ShefDecoder">
 		<constructor-arg value="shef" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml
index 09c6394bcd..dacd8ec427 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml
@@ -2,6 +2,10 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+        <constructor-arg value="text" />
+        <constructor-arg value="Ingest.Text.*" />
+    </bean>
 
 	<bean id="textDecoder" class="com.raytheon.edex.plugin.text.TextDecoder">
 		<property name="pluginName" value="text" />
@@ -236,4 +240,4 @@
 	<bean factory-bean="contextManager" factory-method="registerClusteredContext">
 		<constructor-arg ref="clustered-text-camel" />
   	</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/edexOsgi/com.raytheon.uf.edex.archive/res/spring/archive-spring.xml b/edexOsgi/com.raytheon.uf.edex.archive/res/spring/archive-spring.xml
index 473509382e..23b61fe9a9 100644
--- a/edexOsgi/com.raytheon.uf.edex.archive/res/spring/archive-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.archive/res/spring/archive-spring.xml
@@ -2,6 +2,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+        <constructor-arg value="archive" />
+        <constructor-arg value="Archive.*" />
+    </bean>
 
     <bean id="dataArchiver" class="com.raytheon.uf.edex.archive.DataArchiver"/>
 
diff --git a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml
index 89da5f5eca..389c6d4caa 100644
--- a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml
+++ b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml
@@ -2,7 +2,12 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-	
+
+    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+        <constructor-arg value="satellite" />
+        <constructor-arg value="Ingest.regionalsat.*" />
+    </bean>
+
 	<bean id="regionalSatDecoder" class="gov.noaa.nws.ost.edex.plugin.regionalsat.decoder.RegionalSatDecoder">
 		<property name="source" value="Source" />
 		<property name="filename" value="regional_satellite_netcdf3" />