X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Futils%2FThrottleFilter.java;h=c9fb5a16509b455d45314c37a250f3bdcca36e60;hb=refs%2Fchanges%2F51%2F78851%2F11;hp=7f8d7a8c87ed3f2407b70d2615a6ff61d70e770d;hpb=8cbe8a88bc6dfe8673a33a017fe6a5a3e7ce86c3;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/ThrottleFilter.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/ThrottleFilter.java
index 7f8d7a8c..c9fb5a16 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/ThrottleFilter.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/ThrottleFilter.java
@@ -43,11 +43,11 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.log4j.Logger;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import org.eclipse.jetty.continuation.Continuation;
 import org.eclipse.jetty.continuation.ContinuationSupport;
-import org.eclipse.jetty.server.AbstractHttpConnection;
-import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.*;
 import org.onap.dmaap.datarouter.provisioning.beans.Parameters;
 
 /**
@@ -102,7 +102,7 @@ public class ThrottleFilter extends TimerTask implements Filter {
     private static int m_minutes = 0;            // sampling period
     private static int action = ACTION_DROP;    // action to take (throttle or drop)
 
-    private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");
+    private static EELFLogger logger = EELFManager.getInstance().getLogger("InternalLog");
     private static Map<String, Counter> map = new HashMap<String, Counter>();
     private static final Timer rolex = new Timer();
 
@@ -174,15 +174,15 @@ public class ThrottleFilter extends TimerTask implements Filter {
 
     public void dropFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
             throws IOException, ServletException {
-        int rate = getRequestRate((HttpServletRequest) request);
+        int rate = getRequestRate(request);
         if (rate >= n_requests) {
             // drop request - only works under Jetty
-            String m = String.format("Dropping connection: %s %d bad connections in %d minutes", getConnectionId((HttpServletRequest) request), rate, m_minutes);
+            String m = String.format("Dropping connection: %s %d bad connections in %d minutes", getConnectionId(request), rate, m_minutes);
             logger.info(m);
             Request base_request = (request instanceof Request)
                     ? (Request) request
-                    : AbstractHttpConnection.getCurrentConnection().getRequest();
-            base_request.getConnection().getEndPoint().close();
+                    : HttpConnection.getCurrentConnection().getHttpChannel().getRequest();
+            base_request.getHttpChannel().getEndPoint().close();
         } else {
             chain.doFilter(request, response);
         }
@@ -191,11 +191,11 @@ public class ThrottleFilter extends TimerTask implements Filter {
     public void throttleFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
             throws IOException, ServletException {
         // throttle request
-        String id = getConnectionId((HttpServletRequest) request);
-        int rate = getRequestRate((HttpServletRequest) request);
+        String id = getConnectionId(request);
+        int rate = getRequestRate(request);
         Object results = request.getAttribute(THROTTLE_MARKER);
         if (rate >= n_requests && results == null) {
-            String m = String.format("Throttling connection: %s %d bad connections in %d minutes", getConnectionId((HttpServletRequest) request), rate, m_minutes);
+            String m = String.format("Throttling connection: %s %d bad connections in %d minutes", getConnectionId(request), rate, m_minutes);
             logger.info(m);
             Continuation continuation = ContinuationSupport.getContinuation(request);
             continuation.suspend();