Current time is now passed to intervalHandler

sflow-rt · Mar 15, 2018 · 5e93d2f · 5e93d2f
1 parent 30a21c3
commit 5e93d2f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/scripts/ddos.js b/scripts/ddos.js
@@ -193,8 +193,7 @@ setEventHandler(function(evt) {
   block(ip,info,false);
 },['ddos_blackhole_attack']);
 
-setIntervalHandler(function() {
-  var now = (new Date()).getTime();
+setIntervalHandler(function(now) {
   var threshMs = block_minutes * 60000;
   for(var addr in controls) {
     if(now - controls[addr].time > threshMs) allow(addr,{},false);

diff --git a/scripts/inc/trend.js b/scripts/inc/trend.js
@@ -6,8 +6,8 @@ function Trend(maxPoints, stepSize) {
   for(i = maxPoints - 1; i >= 0; i--) { t -= stepMs; this.times[i] = t; }
 }
 
-Trend.prototype.addPoints = function(values) {
-  this.times.push((new Date).getTime());
+Trend.prototype.addPoints = function(now,values) {
+  this.times.push(now);
 
   var name, i; 
   for (name in values) {

diff --git a/scripts/stats.js b/scripts/stats.js
@@ -25,7 +25,7 @@ function calculateTopN(metric,n,minVal,total_pps) {
   return topN;
 }
 
-setIntervalHandler(function() {
+setIntervalHandler(function(now) {
   points = {};
   var counts = sharedGet('ddos_blackhole_controls_counts') || {};
   points['controls'] = counts.n || 0;
@@ -36,7 +36,7 @@ setIntervalHandler(function() {
   points['routes'] = sharedGet('ddos_blackhole_routes') || 0;
   points['top-5-targets'] = calculateTopN('ddos_blackhole_target',5,1,0);
   points['top-5-protocols'] = calculateTopN('ddos_blackhole_protocol',5,1,0);
-  trend.addPoints(points);  
+  trend.addPoints(now,points);  
 }, 1);
 
 setHttpHandler(function(req) {