[tor-commits] [sbws/master] Replace options validation for cleaning v3bw files

[pastly at torproject.org]

commit d1286fe5369dea4a5fa56cd3b971606309302ca4
Author: juga0 <juga at riseup.net>
Date:   Tue Jul 17 16:19:25 2018 +0000

    Replace options validation for cleaning v3bw files
---
 sbws/util/config.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sbws/util/config.py b/sbws/util/config.py
index a1d5a15..82ce0ec 100644
--- a/sbws/util/config.py
+++ b/sbws/util/config.py
@@ -174,8 +174,8 @@ def _validate_cleanup(conf):
     ints = {
         'stale_days': {'minimum': 1, 'maximum': None},
         'rotten_days': {'minimum': 1, 'maximum': None},
-        'stale_mins_v3bw_files': {'minimum': 1, 'maximum': None},
-        'rotten_mins_v3bw_files': {'minimum': 1, 'maximum': None},
+        'v3bw_files_compress_after_days': {'minimum': 1, 'maximum': None},
+        'v3bw_files_delete_after_days': {'minimum': 1, 'maximum': None},
     }
     all_valid_keys = list(ints.keys())
     errors.extend(_validate_section_keys(conf, sec, all_valid_keys, err_tmpl))
@@ -189,7 +189,6 @@ def _validate_general(conf):
     err_tmpl = Template('$sec/$key ($val): $e')
     ints = {
         'data_period': {'minimum': 1, 'maximum': None},
-        'valid_mins_v3bw_files': {'minimum': 1, 'maximum': None},
         'circuit_timeout': {'minimum': 1, 'maximum': None},
     }
     floats = {