From 52eaaa17d0120b9bfc778f0f8660f496d8ccd61f Mon Sep 17 00:00:00 2001
From: Nate Jensen <Nathan.Jensen@raytheon.com>
Date: Thu, 23 Jan 2014 18:09:50 -0600
Subject: [PATCH] Issue #2359 remove ignore threads capability since it was a
 hack to stop shef and there's a better way to stop shef

Change-Id: I8c2fc8279937aca4e15ea52197081c8271d0c55c

Former-commit-id: 99f45c9a2ae2e82ba88dd8df7e2c008bda863a9e
---
 .../com.raytheon.uf.logsrv/conf/config.xml          |  3 ---
 .../com/raytheon/uf/logsrv/config/LogSrvConfig.java | 11 -----------
 .../com/raytheon/uf/logsrv/derby/DerbyAppender.java | 13 -------------
 3 files changed, 27 deletions(-)

diff --git a/javaUtilities/com.raytheon.uf.logsrv/conf/config.xml b/javaUtilities/com.raytheon.uf.logsrv/conf/config.xml
index 040c26a685..c7f04fdab9 100644
--- a/javaUtilities/com.raytheon.uf.logsrv/conf/config.xml
+++ b/javaUtilities/com.raytheon.uf.logsrv/conf/config.xml
@@ -24,7 +24,4 @@
               -->  
   <timeToSend>00:45</timeToSend>
   
-  <!--  threads to ignore errors on to keep them from overpowering the other errors -->
-  <ignoreThreads>shefThreadPool</ignoreThreads>
-  
 </logSrvConfig>
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/config/LogSrvConfig.java b/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/config/LogSrvConfig.java
index ed1d540533..3e4bffca58 100644
--- a/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/config/LogSrvConfig.java
+++ b/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/config/LogSrvConfig.java
@@ -68,9 +68,6 @@ public class LogSrvConfig {
     @XmlElement
     private String timeToSend;
 
-    @XmlElement
-    private String ignoreThreads;
-
     public String getFromAddress() {
         return fromAddress;
     }
@@ -127,14 +124,6 @@ public class LogSrvConfig {
         this.databaseDir = databaseDir;
     }
 
-    public String getIgnoreThreads() {
-        return ignoreThreads;
-    }
-
-    public void setIgnoreThreads(String ignoreThreads) {
-        this.ignoreThreads = ignoreThreads;
-    }
-
     /**
      * Validates that the config has every value set.
      */
diff --git a/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyAppender.java b/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyAppender.java
index 1b955c9b2d..0108340465 100644
--- a/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyAppender.java
+++ b/javaUtilities/com.raytheon.uf.logsrv/src/com/raytheon/uf/logsrv/derby/DerbyAppender.java
@@ -47,15 +47,9 @@ public class DerbyAppender extends AppenderBase<ILoggingEvent> {
 
     private DerbyDao dao;
 
-    private String[] ignoreThreads;
-
     public DerbyAppender() {
         super();
         dao = DerbyDao.getInstance();
-        String ignore = dao.getConfig().getIgnoreThreads();
-        if (ignore != null) {
-            ignoreThreads = ignore.split(",");
-        }
     }
 
     @Override
@@ -78,13 +72,6 @@ public class DerbyAppender extends AppenderBase<ILoggingEvent> {
      * @return
      */
     private boolean shouldStoreMsg(ILoggingEvent event) {
-        if (ignoreThreads != null) {
-            for (String ignore : ignoreThreads) {
-                if (event.getThreadName().startsWith(ignore)) {
-                    return false;
-                }
-            }
-        }
         return true;
     }
 }