tor-commits July 2018

tor-commits@lists.torproject.org

17 participants
1737 discussions

[sbws/master] Add changelog entry for uml diagrams
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 5f5911f558b57197897be790983b1dedf7f0cc86 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Thu Jul 5 20:23:08 2018 -0400 Add changelog entry for uml diagrams --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index feaff96..ecd79f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Added + +- UML diagrams to documentation. In docs/ run `make umlsvg` to rebuild them. + Requires graphviz to be installed.(GHPR#226) + ### Fixed - Measure relays that have both Exit and BadExit as non-exits, which is how

1 0

[sbws/master] Replace Exception by the possible exceptions
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 026330bcfc2b7ab256d7aeef6bf249a05d9f113c Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:57:48 2018 +0000 Replace Exception by the possible exceptions --- sbws/util/stem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index bbd4e7a..85fd7e6 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -211,7 +211,7 @@ def get_socks_info(controller): try: socks_ports = controller.get_listeners(Listener.SOCKS) return socks_ports[0] - except Exception as e: + except ControllerError as e: log.exception("Exception trying to get socks info: %e.", e) exit(1)

1 0

[sbws/master] Add metadata entry to changelog
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit d67772bae4474b6a4468ab98fdc5a045fd7d5ce8 Author: juga0 <juga(a)riseup.net> Date: Fri Jul 6 16:14:59 2018 +0000 Add metadata entry to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c35713..62f16d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - UML diagrams to documentation. In docs/ run `make umlsvg` to rebuild them. Requires graphviz to be installed.(GHPR#226) +- Add metadata to setup.py, useful for source/binary distributions. ### Fixed

1 0

[sbws/master] Replace Exception by the possible exceptions
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit d1aebaf48960fe7e85299213ff49fc02b71521ae Author: juga0 <juga(a)riseup.net> Date: Wed Jul 4 08:54:53 2018 +0000 Replace Exception by the possible exceptions --- sbws/util/stem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index b62de82..bbd4e7a 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -47,7 +47,7 @@ def add_event_listener(controller, func, event): def remove_event_listener(controller, func): try: controller.remove_event_listener(func) - except Exception as e: + except ProtocolError as e: log.exception("Exception trying to remove event %s", e)

1 0

[sbws/master] Validate and use syslog format
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 15e6cdb718f470762451562b43877e6d720947df Author: juga0 <juga(a)riseup.net> Date: Tue Jul 10 08:00:32 2018 +0000 Validate and use syslog format --- sbws/util/config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sbws/util/config.py b/sbws/util/config.py index 6917033..585d23c 100644 --- a/sbws/util/config.py +++ b/sbws/util/config.py @@ -134,6 +134,7 @@ def configure_logging(args, conf): # Set some stuff that needs config parser's interpolation conf['formatter_to_file']['format'] = conf['logging']['to_file_format'] conf['formatter_to_stdout']['format'] = conf['logging']['to_stdout_format'] + conf['formatter_to_syslog']['format'] = conf['logging']['to_syslog_format'] conf[logger]['level'] = conf['logging']['level'].upper() conf['handler_to_file']['level'] = conf['logging']['to_file_level'].upper() conf['handler_to_stdout']['level'] = \ @@ -294,7 +295,8 @@ def _validate_logging(conf): 'to_file_max_bytes': {'minimum': 0, 'maximum': None}, 'to_file_num_backups': {'minimum': 0, 'maximum': None}, } - unvalidated = ['format', 'to_file_format', 'to_stdout_format'] + unvalidated = ['format', 'to_file_format', 'to_stdout_format', + 'to_syslog_format'] all_valid_keys = list(bools.keys()) + list(enums.keys()) + \ list(ints.keys()) + unvalidated errors.extend(_validate_section_keys(conf, sec, all_valid_keys, err_tmpl))

1 0

[sbws/master] Add changelog entry for system log
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 4d01e9ae705b5491c2b36b6ccf99c7ed4def2db7 Author: juga0 <juga(a)riseup.net> Date: Sat Jul 7 16:28:28 2018 +0000 Add changelog entry for system log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7a18b9..8608b1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - UML diagrams to documentation. In docs/ run `make umlsvg` to rebuild them. Requires graphviz to be installed.(GHPR#226) - Add metadata to setup.py, useful for source/binary distributions. +- Add possibility to log to system log. (#26683) ### Fixed

1 0

[sbws/master] Add package metadata
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit bab1f33c54c29244cb33f169acf3a047c1e1a683 Author: juga0 <juga(a)riseup.net> Date: Fri Jul 6 09:22:56 2018 +0000 Add package metadata and add a simple first sentence about what this program does. --- README.md | 3 +++ setup.py | 29 ++++++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index a066d0c..74da116 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,9 @@ [![Build Status](https://travis-ci.org/pastly/simple-bw-scanner.svg?branch=master)](… +`simple-bw-scanner` (also called `sbws`) is a Tor bandwidth scanner that +produces bandwidth measurements files to be used by Directory Authorities. + It doesn't get simpler than this, folks. The scanner builds two hop circuits consisting of the relay being measured and diff --git a/setup.py b/setup.py index 738be70..e009a7b 100755 --- a/setup.py +++ b/setup.py @@ -8,10 +8,10 @@ import os here = os.path.abspath(os.path.dirname(__file__)) -# Causes the lint Travis builds to fail for some reason, so just going to -# remove the long description for now. -# with open(os.path.join(here, 'README.md'), encoding='utf-8') as f: -# long_description = f.read() + +def long_description(): + with open(os.path.join(here, 'README.md'), encoding='utf-8') as f: + return f.read() def get_package_data(): @@ -44,18 +44,22 @@ setup( name='sbws', version=find_version(), description='Simple Bandwidth Scanner', - # long_description=long_description, + long_description=long_description(), + long_description_content_type="text/markdown", author='Matt Traudt', author_email='pastly(a)torproject.org', license='CC0', - # https://packaging.python.org/tutorials/distributing-packages/#id48 - # https://pypi.python.org/pypi?%3Aaction=list_classifiers + url="https://gitweb.torproject.org/sbws.git", classifiers=[ - # How mature is this project? Common values are - # 3 - Alpha - # 4 - Beta - # 5 - Production/Stable 'Development Status :: 4 - Beta', + "Environment :: Console", + 'Intended Audience :: Developers', + 'Intended Audience :: System Administrators', + 'Operating System :: OS Independent', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Topic :: System :: Networking', ], packages=find_packages(), include_package_data=True, @@ -63,9 +67,8 @@ setup( 'sbws': get_package_data(), }, data_files=get_data_files(), - keywords='', + keywords='tor onion bandwidth measurements scanner relay circuit', python_requires='>=3.4.5', - # test_suite='test', entry_points={ 'console_scripts': [ 'sbws = sbws.sbws:main',

1 0

[sbws/master] Add format to default config file
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 031a808d9d1bda37659ecde82aa4890840f09950 Author: juga0 <juga(a)riseup.net> Date: Tue Jul 10 07:59:37 2018 +0000 Add format to default config file --- sbws/config.default.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/sbws/config.default.ini b/sbws/config.default.ini index 04bdd61..e08b3b9 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -104,5 +104,6 @@ to_stdout_level = ${level} format = [%(asctime)s] [%(name)s] [%(levelname)s] %(message)s to_file_format = ${format} to_stdout_format = ${format} +to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s # verbose formatter useful for debugging #format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s

1 0

[sbws/master] Remove level from default log config file
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit 9b9baad50e9fab6195d75ec931b063137aa82798 Author: juga0 <juga(a)riseup.net> Date: Tue Jul 10 08:01:20 2018 +0000 Remove level from default log config file --- sbws/config.log.default.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/sbws/config.log.default.ini b/sbws/config.log.default.ini index 80f7172..deb6275 100644 --- a/sbws/config.log.default.ini +++ b/sbws/config.log.default.ini @@ -31,7 +31,6 @@ args = ('/dev/null', ) [handler_to_syslog] class=handlers.SysLogHandler formatter=to_syslog -level = INFO args = ('/dev/log',) [formatter_to_stdout]

1 0

[sbws/master] Remove format from default log file
by pastly＠torproject.org 11 Jul '18

11 Jul '18

commit c80d4ecd9cbe9dbd09d6f5998a3e3463a1c0374e Author: juga0 <juga(a)riseup.net> Date: Tue Jul 10 07:59:08 2018 +0000 Remove format from default log file --- sbws/config.log.default.ini | 3 --- 1 file changed, 3 deletions(-) diff --git a/sbws/config.log.default.ini b/sbws/config.log.default.ini index d841ccf..80f7172 100644 --- a/sbws/config.log.default.ini +++ b/sbws/config.log.default.ini @@ -38,7 +38,4 @@ args = ('/dev/log',) [formatter_to_file] -# syslog-like formatter [formatter_to_syslog] -format = %(asctime)s %(module)s[%(process)s]: <%(levelname)s> %(message)s -datefmt = %b %d %H:%M:%S

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2018