October 2018 - tor-commits - lists.torproject.org

[sbws/master] Fix typo to allow logging to file
by juga＠torproject.org 08 Oct '18

08 Oct '18

commit 84a09d06baf99c94476a66cf46c6531399f4c5a2 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Fri Oct 5 15:32:05 2018 -0400 Fix typo to allow logging to file --- sbws/util/fs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/fs.py b/sbws/util/fs.py index f61f07f..e5e7173 100644 --- a/sbws/util/fs.py +++ b/sbws/util/fs.py @@ -65,7 +65,7 @@ def sbws_required_disk_space(conf): space_log_files = 0 if conf.getboolean('logging', 'to_file'): size_log_file = conf.getint('logging', 'to_file_max_bytes') - num_log_files = conf.geting('logging', 'to_file_num_backups') + num_log_files = conf.getint('logging', 'to_file_num_backups') space_log_files = size_log_file * num_log_files text_dict['mb_log'] = space_log_files # roughly, size of a current tor dir

1 0

[sbws/master] Standardize new args from --foo_bar to --foo-bar
by juga＠torproject.org 08 Oct '18

08 Oct '18

commit 699c7d69b731e4bf0289b418a2aaa6925c11e656 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Fri Oct 5 12:43:00 2018 -0400 Standardize new args from --foo_bar to --foo-bar --- sbws/core/generate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 6d91690..cd3b619 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -33,12 +33,12 @@ def gen_parser(sub): p.add_argument('--scale-constant', default=SBWS_SCALE_CONSTANT, type=int, help='When scaling bw weights, scale them using this const ' 'multiplied by the number of measured relays') - p.add_argument('--scale_sbws', action='store_true', + p.add_argument('--scale-sbws', action='store_true', help='If specified, do not use bandwidth values as they ' 'are, but scale them such that we have a budget of ' 'scale_constant * num_measured_relays = bandwidth to give ' 'out, and we do so proportionally') - p.add_argument('-t', '--scale_torflow', action='store_true', + p.add_argument('-t', '--scale-torflow', action='store_true', help='If specified, do not use bandwidth values as they ' 'are, but scale them in the way Torflow does.') p.add_argument('-m', '--torflow-bw-margin', default=TORFLOW_BW_MARGIN,

1 0

[sbws/master] Do not include defaults in string args
by juga＠torproject.org 08 Oct '18

08 Oct '18

commit 4b655208cf77c6baa62c9929a5d049df47939dee Author: juga0 <juga(a)riseup.net> Date: Tue Oct 2 23:54:44 2018 +0000 Do not include defaults in string args --- sbws/core/generate.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 6d91690..d82b6fe 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -43,22 +43,20 @@ def gen_parser(sub): 'are, but scale them in the way Torflow does.') p.add_argument('-m', '--torflow-bw-margin', default=TORFLOW_BW_MARGIN, type=float, - help="Cap maximum bw when scaling as Torflow. " - "(Default: 0.05)") + help="Cap maximum bw when scaling as Torflow. ") p.add_argument('-r', '--torflow-round-digs', default=TORFLOW_ROUND_DIG, type=int, help="Number of most significant digits to round bw " - "when scaling as Torflow. (Default: 3)") + "when scaling as Torflow.") p.add_argument('-p', '--secs-recent', default=None, help="How many secs in the past are results being " "still considered. Note this value will supersede " - "data_period in the configuration. (Default: None)") + "data_period in the configuration.") p.add_argument('-a', '--secs-away', default=DAY_SECS, help="How many secs results have to be away from each " - "other. (Default: 86400 - one day -)") + "other.") p.add_argument('-n', '--min-num', default=NUM_MIN_RESULTS, - help="Mininum number of a results to consider them." - "(Default: 2)") + help="Mininum number of a results to consider them.") def main(args, conf):

1 0

[sbws/master] Merge branch 'ticket27918_arg_types'
by juga＠torproject.org 08 Oct '18

08 Oct '18

commit 5132ca92c78f63ff99b664c1ada92a8eacb13bab Merge: 90806ef 8aa5da9 Author: juga0 <juga(a)riseup.net> Date: Mon Oct 8 07:48:06 2018 +0000 Merge branch 'ticket27918_arg_types' sbws/core/generate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[sbws/master] Add changelog entry about not printing default args
by juga＠torproject.org 08 Oct '18

08 Oct '18

commit f4a8700a22b0365f0f3ecec8a05b2e9b6cab1ae1 Author: juga0 <juga(a)riseup.net> Date: Mon Oct 8 07:58:23 2018 +0000 Add changelog entry about not printing default args --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0440a0..964f4a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Stop using directory as argument in integration tests (#27342) - Fix typo getting configuration option to allow logging to file (#27960) - Set int type to new arguments that otherwise would be string (#27918) +- Stop printing arguments default values, since they are printed by default + (#27916) ### Changed

1 0

[sbws/master] Add changelog entry about typo logging
by juga＠torproject.org 08 Oct '18

08 Oct '18

commit 90806eff45fd49ba0b6f6bdac86cff36a90ebd97 Author: juga0 <juga(a)riseup.net> Date: Mon Oct 8 07:43:14 2018 +0000 Add changelog entry about typo logging --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 933b311..401ed9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Broken environment variable in default sbws config. To use envvar $FOO, write $$FOO in the config. - Stop using directory as argument in integration tests (#27342) +- Fix typo getting configuration option to allow logging to file (#27960) ### Changed

1 0

[sbws/master] Add type to cli args that are not str
by juga＠torproject.org 08 Oct '18

08 Oct '18

commit 8aa5da92bd19e407d0ebff3f35e7c6feb634676e Author: juga0 <juga(a)riseup.net> Date: Wed Oct 3 00:02:04 2018 +0000 Add type to cli args that are not str --- sbws/core/generate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index 6d91690..f00852f 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -49,14 +49,14 @@ def gen_parser(sub): type=int, help="Number of most significant digits to round bw " "when scaling as Torflow. (Default: 3)") - p.add_argument('-p', '--secs-recent', default=None, + p.add_argument('-p', '--secs-recent', default=None, type=int, help="How many secs in the past are results being " "still considered. Note this value will supersede " "data_period in the configuration. (Default: None)") - p.add_argument('-a', '--secs-away', default=DAY_SECS, + p.add_argument('-a', '--secs-away', default=DAY_SECS, type=int, help="How many secs results have to be away from each " "other. (Default: 86400 - one day -)") - p.add_argument('-n', '--min-num', default=NUM_MIN_RESULTS, + p.add_argument('-n', '--min-num', default=NUM_MIN_RESULTS, type=int, help="Mininum number of a results to consider them." "(Default: 2)")

1 0

[sbws/master] Merge branch 'ticket27916_no_print_default'
by juga＠torproject.org 08 Oct '18

08 Oct '18

commit c586dc1e89ba4d69afd10a45bf0ea9cc3bd615d9 Merge: 63c6649 4b65520 Author: juga0 <juga(a)riseup.net> Date: Mon Oct 8 07:56:57 2018 +0000 Merge branch 'ticket27916_no_print_default' sbws/core/generate.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --cc sbws/core/generate.py index f00852f,d82b6fe..0a68cbf --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@@ -48,17 -47,16 +47,16 @@@ def gen_parser(sub) p.add_argument('-r', '--torflow-round-digs', default=TORFLOW_ROUND_DIG, type=int, help="Number of most significant digits to round bw " - "when scaling as Torflow. (Default: 3)") + "when scaling as Torflow.") - p.add_argument('-p', '--secs-recent', default=None, + p.add_argument('-p', '--secs-recent', default=None, type=int, help="How many secs in the past are results being " "still considered. Note this value will supersede " - "data_period in the configuration. (Default: None)") + "data_period in the configuration.") - p.add_argument('-a', '--secs-away', default=DAY_SECS, + p.add_argument('-a', '--secs-away', default=DAY_SECS, type=int, help="How many secs results have to be away from each " - "other. (Default: 86400 - one day -)") + "other.") - p.add_argument('-n', '--min-num', default=NUM_MIN_RESULTS, + p.add_argument('-n', '--min-num', default=NUM_MIN_RESULTS, type=int, - help="Mininum number of a results to consider them." - "(Default: 2)") + help="Mininum number of a results to consider them.") def main(args, conf):

1 0

[sbws/master] Add changelog entry about type in new arguments
by juga＠torproject.org 08 Oct '18

08 Oct '18

commit 63c6649af2990226cad9c28ff1f525545557150c Author: juga0 <juga(a)riseup.net> Date: Mon Oct 8 07:50:23 2018 +0000 Add changelog entry about type in new arguments --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 401ed9a..e0440a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. $$FOO in the config. - Stop using directory as argument in integration tests (#27342) - Fix typo getting configuration option to allow logging to file (#27960) +- Set int type to new arguments that otherwise would be string (#27918) ### Changed

1 0

[sbws/master] Add changelog entry about standard cli args
by juga＠torproject.org 08 Oct '18

08 Oct '18

commit fe62a356a62a41849f5f24cb35623a3b80e0042a Author: juga0 <juga(a)riseup.net> Date: Mon Oct 8 08:02:04 2018 +0000 Add changelog entry about standard cli args --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 964f4a1..c313ebb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Set int type to new arguments that otherwise would be string (#27918) - Stop printing arguments default values, since they are printed by default (#27916) +- Use dash instead of underscore in new cli argument names (#27917) ### Changed

1 0