Add cidr blacklist

Author: benmfaul

src/com/jacamars/dsp/rtb/bidder/CampaignSelector.java

@@ -115,7 +115,7 @@ public BidResponse getMaxConnections(BidRequest br) throws Exception {
         List<Campaign> list = Preshuffle.getInstance().getPreShuffledCampaignList();
 
         if (list == null) {
-            logger.error("No preshuffled campaigns lists");
+            logger.debug("No preshuffled campaigns lists");
             return null;
         }
 
@@ -196,6 +196,9 @@ public BidResponse getMaxConnections(BidRequest br) throws Exception {
         if (RTBServer.frequencyGoverner != null)
             RTBServer.frequencyGoverner.add(winner.camp.adId,br);
 
+        if (xtest) {
+        	logger.info("Selected winner in " + xtime + " ms");
+        }
         return winner;
     }
 

src/com/jacamars/dsp/rtb/bidder/RTBServer.java

@@ -152,7 +152,7 @@ public class RTBServer implements Runnable {
     /**
      * number of threads in the jetty thread pool
      */
-    public static int threads = 1024;
+    public static int threads = 2048;
 
     /**
      * a counter for the number of requests the bidder has received and
@@ -199,6 +199,7 @@ public class RTBServer implements Runnable {
      * The average time
      */
     public volatile static long avgBidTime;
+    public volatile static String  savgbidtime = "0";
     public volatile static long avgNoBidTime;
 
     public volatile static long throttleTime = 0;
@@ -536,7 +537,7 @@ public void run() {
             return;
         }
 
-        QueuedThreadPool threadPool = new QueuedThreadPool(threads, 50);
+        QueuedThreadPool threadPool = new QueuedThreadPool(threads, 128);
         server = new Server(threadPool);
         ServerConnector connector = null;
 
@@ -649,7 +650,7 @@ public void run() {
     void startSeparateAdminServer() throws Exception {
         SSL ssl = Configuration.getInstance().ssl;
 
-        QueuedThreadPool threadPool = new QueuedThreadPool(threads, 50);
+        QueuedThreadPool threadPool = new QueuedThreadPool(threads, 128);
         Server server = new Server(threadPool);
         ServerConnector connector;
 
@@ -752,7 +753,7 @@ private void startPeridocLogger() throws Exception {
                     davgNoBidTime /= nowindow;
 
                     String sqps = String.format("%.2f", qps);
-                    String savgbidtime = String.format("%.2f", davgBidTime);
+                    savgbidtime = String.format("%.2f", davgBidTime);
                     String savgnobidtime = String.format("%.2f", davgNoBidTime);
 
                     long a = ForensiqClient.forensiqXtime.get();
@@ -1285,9 +1286,12 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
                 String rs= request.getQueryString();
                 String rtype = request.getParameter("target");
                 if (rtype == null) {
-                    logger.warn("Warning, wrong callback message, params: {}",rs);
-                    response.getWriter().println("");
-                    return;
+                	rtype = request.getParameter("type");
+                	if (rtype == null) {
+                		logger.warn("Warning, wrong callback message, params: {}",rs);
+                		response.getWriter().println("");
+                		return;
+                	}
                 }
                 boolean debug = false;
                 String dbg = request.getParameter("debug");

src/com/jacamars/dsp/rtb/bidder/WebCampaign.java

@@ -874,7 +874,7 @@ private List getStatus() throws Exception {
 				values.put("errors", RTBServer.error);
 				values.put("adspend", RTBServer.adspend);
 				values.put("qps", RTBServer.qps);
-				values.put("avgx", RTBServer.avgx);
+				values.put("avgx", RTBServer.savgbidtime);
 				values.put("exchanges", BidRequest.getExchangeCounts());
 				values.put("cperf", CampaignProcessor.probe.getMap());
 			} else {

src/com/jacamars/dsp/rtb/common/Configuration.java

@@ -396,20 +396,11 @@ public void initialize(String path, String shard, int port, int sslPort, String
 		 * USE ZOOKEEPER, AEROSPIKE OR FILE CONFIG
 		 *********************************************/
 		String str = null;
-		if (path.startsWith("zookeeper")) {
-			String parts[] = path.split(":");
-			logger.info("Zookeeper: {}", "" + parts);
-			zk = new ZkConnect(parts[1]);
-			zk.join(parts[2], "bidders", instanceName);
-			str = zk.readConfig(parts[2] + "/bidders");
-		} else {
-			byte[] encoded = Files.readAllBytes(Paths.get(path));
-			str = Charset.defaultCharset().decode(ByteBuffer.wrap(encoded)).toString();
-
-			str = Configuration.substitute(str);
+		byte[] encoded = Files.readAllBytes(Paths.get(path));
+		str = Charset.defaultCharset().decode(ByteBuffer.wrap(encoded)).toString();
 
-			System.out.println(str);
-		}
+		str = Configuration.substitute(str);
+		System.out.println("AFTER SUBSTITUTIONS, CONFIGURATION:\n" + str);
 
 		Map<?, ?> m = DbTools.mapper.readValue(str, Map.class);
 		/*******************************************************************************/

web/admin.html

@@ -1223,7 +1223,7 @@ <h3 class="panel-title">Templates</h3>
 	   				 	 total_qps += qps;
 	   				  	 sqps = Number(qps).toFixed(2);
 	   				  }
-	   				  systemDyno.add([e.name, v.total,v.request,v.fraud,v.bid,v.nobid,v.win,v.pixels,v.clicks,v.errors,pbid,pwin,ppix,pclc,percFraud,spnd,sqps,Number(v.avgx).toFixed(6)]);
+	   				  systemDyno.add([e.name, v.total,v.request,v.fraud,v.bid,v.nobid,v.win,v.pixels,v.clicks,v.errors,pbid,pwin,ppix,pclc,percFraud,spnd,sqps,v.avgx]);
 	   				  total += v.total;
 	   				  bid += v.bid;
 	   				  nobid += v.nobid;
@@ -2054,7 +2054,7 @@ <h3 class="panel-title">Templates</h3>
  	listsDyno = new DynamicTable("addlists",listCells);
 
  systemCells = [];
- 	systemCells.push("<input type='text' id='SUB_ID' size='30' readonly value=''/>");
+ 	systemCells.push("<input type='text' id='SUB_ID' size='20' readonly value=''/>");
  	systemCells.push("<input type='text' id='SUB_ID' size='8'  readonly value=''  style='text-align:right;'/>");
  	systemCells.push("<input type='text' id='SUB_ID' size='8'  readonly value=''  style='text-align:right;'/>");
  	systemCells.push("<input type='text' id='SUB_ID' size='8'  readonly value=''  style='text-align:right;'/>");