\r
package org.onap.dmaap.datarouter.provisioning.utils;\r
\r
+import com.att.eelf.configuration.EELFLogger;\r
+import com.att.eelf.configuration.EELFManager;\r
import java.io.IOException;\r
import java.io.InputStream;\r
import java.util.ArrayList;\r
import java.util.Map;\r
import java.util.Timer;\r
import java.util.TimerTask;\r
-import java.util.Vector;\r
-\r
import javax.servlet.Filter;\r
import javax.servlet.FilterChain;\r
import javax.servlet.FilterConfig;\r
import javax.servlet.ServletResponse;\r
import javax.servlet.http.HttpServletRequest;\r
import javax.servlet.http.HttpServletResponse;\r
-\r
-import org.apache.log4j.Logger;\r
import org.eclipse.jetty.continuation.Continuation;\r
import org.eclipse.jetty.continuation.ContinuationSupport;\r
-import org.eclipse.jetty.server.*;\r
+import org.eclipse.jetty.server.HttpConnection;\r
+import org.eclipse.jetty.server.Request;\r
import org.onap.dmaap.datarouter.provisioning.beans.Parameters;\r
\r
/**\r
* @version $Id: ThrottleFilter.java,v 1.2 2014/03/12 19:45:41 eby Exp $\r
*/\r
public class ThrottleFilter extends TimerTask implements Filter {\r
- public static final int DEFAULT_N = 10;\r
- public static final int DEFAULT_M = 5;\r
- public static final String THROTTLE_MARKER = "org.onap.dmaap.datarouter.provisioning.THROTTLE_MARKER";\r
+ private static final int DEFAULT_N = 10;\r
+ private static final int DEFAULT_M = 5;\r
+ private static final String THROTTLE_MARKER = "org.onap.dmaap.datarouter.provisioning.THROTTLE_MARKER";\r
private static final String JETTY_REQUEST = "org.eclipse.jetty.server.Request";\r
private static final long ONE_MINUTE = 60000L;\r
private static final int ACTION_DROP = 0;\r
\r
// Configuration\r
private static boolean enabled = false; // enabled or not\r
- private static int n_requests = 0; // number of requests in M minutes\r
- private static int m_minutes = 0; // sampling period\r
+ private static int numRequests = 0; // number of requests in M minutes\r
+ private static int samplingPeriod = 0; // sampling period\r
private static int action = ACTION_DROP; // action to take (throttle or drop)\r
\r
- private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
- private static Map<String, Counter> map = new HashMap<String, Counter>();\r
+ private static EELFLogger logger = EELFManager.getInstance().getLogger("InternalLog");\r
+ private static Map<String, Counter> map = new HashMap<>();\r
private static final Timer rolex = new Timer();\r
\r
@Override\r
try {\r
Class.forName(JETTY_REQUEST);\r
String v = p.getValue();\r
- if (v != null && !v.equals("off")) {\r
+ if (v != null && !"off".equals(v)) {\r
String[] pp = v.split(",");\r
if (pp != null) {\r
- n_requests = (pp.length > 0) ? getInt(pp[0], DEFAULT_N) : DEFAULT_N;\r
- m_minutes = (pp.length > 1) ? getInt(pp[1], DEFAULT_M) : DEFAULT_M;\r
- action = (pp.length > 2 && pp[2] != null && pp[2].equalsIgnoreCase("throttle")) ? ACTION_THROTTLE : ACTION_DROP;\r
+ numRequests = (pp.length > 0) ? getInt(pp[0], DEFAULT_N) : DEFAULT_N;\r
+ samplingPeriod = (pp.length > 1) ? getInt(pp[1], DEFAULT_M) : DEFAULT_M;\r
+ action = (pp.length > 2 && pp[2] != null && "throttle".equalsIgnoreCase(pp[2])) ? ACTION_THROTTLE : ACTION_DROP;\r
enabled = true;\r
// ACTION_THROTTLE is not currently working, so is not supported\r
if (action == ACTION_THROTTLE) {\r
action = ACTION_DROP;\r
logger.info("Throttling is not currently supported; action changed to DROP");\r
}\r
- logger.info("ThrottleFilter is ENABLED for /publish requests; N=" + n_requests + ", M=" + m_minutes + ", Action=" + action);\r
+ logger.info("ThrottleFilter is ENABLED for /publish requests; N=" + numRequests + ", M=" + samplingPeriod\r
+ + ", Action=" + action);\r
return;\r
}\r
}\r
} catch (ClassNotFoundException e) {\r
- logger.warn("Class " + JETTY_REQUEST + " is not available; this filter requires Jetty.");\r
+ logger.warn("Class " + JETTY_REQUEST + " is not available; this filter requires Jetty.", e);\r
}\r
}\r
logger.info("ThrottleFilter is DISABLED for /publish requests.");\r
public void dropFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain)\r
throws IOException, ServletException {\r
int rate = getRequestRate(request);\r
- if (rate >= n_requests) {\r
+ if (rate >= numRequests) {\r
// drop request - only works under Jetty\r
- String m = String.format("Dropping connection: %s %d bad connections in %d minutes", getConnectionId(request), rate, m_minutes);\r
+ String m = String.format("Dropping connection: %s %d bad connections in %d minutes", getConnectionId(request), rate,\r
+ samplingPeriod);\r
logger.info(m);\r
- Request base_request = (request instanceof Request)\r
+ Request baseRequest = (request instanceof Request)\r
? (Request) request\r
: HttpConnection.getCurrentConnection().getHttpChannel().getRequest();\r
- base_request.getHttpChannel().getEndPoint().close();\r
+ baseRequest.getHttpChannel().getEndPoint().close();\r
} else {\r
chain.doFilter(request, response);\r
}\r
}\r
\r
- public void throttleFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain)\r
+ private void throttleFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain)\r
throws IOException, ServletException {\r
// throttle request\r
String id = getConnectionId(request);\r
int rate = getRequestRate(request);\r
Object results = request.getAttribute(THROTTLE_MARKER);\r
- if (rate >= n_requests && results == null) {\r
- String m = String.format("Throttling connection: %s %d bad connections in %d minutes", getConnectionId(request), rate, m_minutes);\r
+ if (rate >= numRequests && results == null) {\r
+ String m = String.format("Throttling connection: %s %d bad connections in %d minutes",\r
+ getConnectionId(request), rate, samplingPeriod);\r
logger.info(m);\r
Continuation continuation = ContinuationSupport.getContinuation(request);\r
continuation.suspend();\r
}\r
}\r
\r
- private Map<String, List<Continuation>> suspended_requests = new HashMap<String, List<Continuation>>();\r
+ private Map<String, List<Continuation>> suspendedRequests = new HashMap<>();\r
\r
private void register(String id, Continuation continuation) {\r
- synchronized (suspended_requests) {\r
- List<Continuation> list = suspended_requests.get(id);\r
+ synchronized (suspendedRequests) {\r
+ List<Continuation> list = suspendedRequests.get(id);\r
if (list == null) {\r
- list = new ArrayList<Continuation>();\r
- suspended_requests.put(id, list);\r
+ list = new ArrayList<>();\r
+ suspendedRequests.put(id, list);\r
}\r
list.add(continuation);\r
}\r
}\r
\r
private void resume(String id) {\r
- synchronized (suspended_requests) {\r
- List<Continuation> list = suspended_requests.get(id);\r
+ synchronized (suspendedRequests) {\r
+ List<Continuation> list = suspendedRequests.get(id);\r
if (list != null) {\r
// when the waited for event happens\r
Continuation continuation = list.remove(0);\r
*/\r
private int getRequestRate(HttpServletRequest request) {\r
String expecthdr = request.getHeader("Expect");\r
- if (expecthdr != null && expecthdr.equalsIgnoreCase("100-continue"))\r
+ if (expecthdr != null && "100-continue".equalsIgnoreCase(expecthdr))\r
return 0;\r
\r
String key = getConnectionId(request);\r
cnt = new Counter();\r
map.put(key, cnt);\r
}\r
- int n = cnt.getRequestRate();\r
- return n;\r
+ return cnt.getRequestRate();\r
}\r
}\r
\r
public class Counter {\r
- private List<Long> times = new Vector<Long>(); // a record of request times\r
+ private List<Long> times = new ArrayList<>(); // a record of request times\r
\r
public int prune() {\r
try {\r
- long n = System.currentTimeMillis() - (m_minutes * ONE_MINUTE);\r
+ long n = System.currentTimeMillis() - (samplingPeriod * ONE_MINUTE);\r
long t = times.get(0);\r
while (t < n) {\r
times.remove(0);\r
t = times.get(0);\r
}\r
} catch (IndexOutOfBoundsException e) {\r
- // ignore\r
+ logger.trace("Exception: " + e.getMessage(), e);\r
}\r
return times.size();\r
}\r
if (ix < 0 || ix == path.length() - 1)\r
return -2;\r
try {\r
- int feedid = Integer.parseInt(path.substring(0, ix));\r
- return feedid;\r
+ return Integer.parseInt(path.substring(0, ix));\r
} catch (NumberFormatException e) {\r
return -1;\r
}\r
Code Review / dmaap / datarouter.git / blobdiff