From 0bdf4689428531a70eae6be46dfbd523a9885680 Mon Sep 17 00:00:00 2001
From: Richard Peter <richard.peter@raytheon.com>
Date: Mon, 19 May 2014 11:59:00 -0500
Subject: [PATCH] Omaha #2782: Fix DD logging.

Change-Id: Id377941213f50ab2ea6f0c1e72a64579d126b168

Former-commit-id: 7fb6487460c9175fbd99cfff4df54e0ae751d29e [formerly 685ba4c0c598cb433bf0dcffbf943314f619578b] [formerly b7e630bda77fc7b4b421fd7a1805e484bedf0815 [formerly b257c36bf2203e00e1f615a345b942987edfcf7a]]
Former-commit-id: b7e630bda77fc7b4b421fd7a1805e484bedf0815
Former-commit-id: 209e076385a7cbf6f3871313ac82b308aeddc0eb
---
 .../build.edex/esb/conf/logback-registry.xml  | 19 ++++---------------
 .../res/spring/crawler-datadelivery.xml       | 10 ++++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/edexOsgi/build.edex/esb/conf/logback-registry.xml b/edexOsgi/build.edex/esb/conf/logback-registry.xml
index 20db4e7572..3d48899b0c 100644
--- a/edexOsgi/build.edex/esb/conf/logback-registry.xml
+++ b/edexOsgi/build.edex/esb/conf/logback-registry.xml
@@ -17,18 +17,6 @@
       </encoder>
    </appender>
 
-   <!-- harvester log --> 
-   <appender name="HarvesterLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-         <fileNamePattern>${edex.home}/logs/edex-${edex.run.mode}-harvester-%d{yyyyMMdd}.log</fileNamePattern>
-         <maxHistory>30</maxHistory>
-      </rollingPolicy> 
-
-      <encoder> 
-         <pattern>%-5p %d [%t] %c{0}: %m%n</pattern> 
-      </encoder>
-   </appender>
-   
    <!-- BandwidthManager log --> 
    <appender name="BandwidthManagerLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
       <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -90,10 +78,11 @@
    </appender>
 
    <appender name="ThreadBasedLog" class="com.raytheon.uf.common.status.logback.ThreadBasedAppender">
-      <threadPatterns>HarvesterLog:harvester.*,crawlerThreadPool.*,Crawler.*</threadPatterns>
-      <defaultAppender>console</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>console</defaultAppenderName>
       <appender-ref ref="console"/>
-      <appender-ref ref="HarvesterLog"/>
    </appender>
   
    <logger name="com.raytheon">
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml
index 500edf6fe7..119b4ea967 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml
@@ -2,6 +2,16 @@
     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">
 
+    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+        <constructor-arg value="harvester" />
+        <constructor-arg value="harvester.*" />
+    </bean>
+
+    <bean class="com.raytheon.uf.common.status.logback.ThreadBasedAppender" factory-method="registerThreadPattern">
+        <constructor-arg value="harvester" />
+        <constructor-arg value="crawlerThreadPool.*" />
+    </bean>
+
     <!--  These beans have internal cron triggering now, read directly from the harvester config files -->
     <bean id="MainCrawler" class="com.raytheon.uf.edex.datadelivery.harvester.crawler.MainSequenceCrawlLauncher"/>
     <bean id="SeedCrawler" class="com.raytheon.uf.edex.datadelivery.harvester.crawler.SeedCrawlLauncher"/>