[tor-commits] [sbws/master] Generate bandwidth file without relays' old IPs

[pastly at torproject.org]

commit 64a33f63f91549a427ba16c52c75dd419c6079e7
Author: juga0 <juga at riseup.net>
Date:   Mon Jun 18 13:32:58 2018 +0000

    Generate bandwidth file without relays' old IPs
---
 sbws/core/generate.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sbws/core/generate.py b/sbws/core/generate.py
index 25653b1..69c224d 100644
--- a/sbws/core/generate.py
+++ b/sbws/core/generate.py
@@ -71,8 +71,11 @@ def main(args, conf):
         fail_hard('--scale-constant must be positive')
 
     fresh_days = conf.getint('general', 'data_period')
+    reset_bw_ipv4_changes = conf.getboolean('general', 'reset_bw_ipv4_changes')
+    reset_bw_ipv6_changes = conf.getboolean('general', 'reset_bw_ipv6_changes')
     results = load_recent_results_in_datadir(
-        fresh_days, datadir, success_only=True)
+        fresh_days, datadir, success_only=True, ipv4=reset_bw_ipv4_changes,
+        ipv6=reset_bw_ipv6_changes)
     if len(results) < 1:
         log.warning('No recent results, so not generating anything. (Have you '
                     'ran sbws scanner recently?)')