FVDE/ennstatus Changeset - 83bd05c310e2 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 83bd05c310e2

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 3 0

Dennis Fink - 9 years ago 2016-05-16 14:16:23
dennis.fink@c3l.lu

Merged hotfix-oninoo-index-error

3 files changed with 8 insertions and 2 deletions:

ennstatus/api/model.py

ennstatus/api/views.py

setup.py

0 comments (0 inline, 0 general)

ennstatus/api/model.py

➞

Show inline comments

@@ @@ -226,25 +226,28 @@ class Server: @@
         url = 'https://onionoo.torproject.org/weights?lookup={}'.format(
             self.fingerprint
+        )
         data = requests.get(url)
         try:
             data.raise_for_status()
         except requests.HTTPError as e:
             raise e
         else:
             data = data.json()['relays'][0]
             try:
                 data = data.json()['relays'][0]
             except IndexError as e:
                 raise RuntimeError from e
         self.mean_consensus_weight = calculate_weight(data['consensus_weight'])
         self.mean_exit_probability = calculate_weight(data['exit_probability'])
         self.mean_guard_probability = calculate_weight(
             data['guard_probability']
+        )
         self.mean_middle_probability = calculate_weight(
             data['middle_probability']
+        )
         self.mean_consensus_weight_fraction = calculate_weight(
             data['consensus_weight_fraction']
+        )

ennstatus/api/views.py

➞

Show inline comments

@@ @@ -114,24 +114,27 @@ def update(): @@
         server = Server.from_dict(data)
     except Exception as e:
         current_app.logger.warning(' '.join([str(e), str(data)]))
         return str(e), 409, {'Content-Type': 'text/plain'}
     try:
         server.update_weights()
     except NotImplementedError:
         pass
     except requests.HTTPError as e:
         current_app.logger.error(str(e), exc_info=True)
         pass
     except RuntimeError as e:
         current_app.logger.error(str(e), exc_info=True)
         pass
     try:
         server.save()
     except Exception as e:
         current_app.logger.error(str(e))
         return str(e), 500, {'Content-Type': 'text/plain'}
     current_app.logger.info('Return result')
     return (
         server.json(), 201,
+        {
             'Location': '/api/export/json/single?server_name={}'.format(

setup.py

➞

Show inline comments

@@ @@ -2,25 +2,25 @@ from setuptools import setup, find_packa @@
 def _get_requirements():
     with open('requirements.in', encoding='utf-8') as f:
         lines = f.readlines()
     lines = [line[:-1] for line in lines if not line.startswith('#')]
     return lines
 setup(name='Ennstatus',
-      version='5.4.3',
+      version='5.4.4',
       description=('Ennstatus provides the user with vital information about '
                    'the status of the organizations Tor servers.'),
       author='Frënn vun der Ënn',
       author_email='info@enn.lu',
       url='https://bitbucket.org/fvde/ennstatus',
       license='GPLv3+',
       packages=find_packages(),
       install_requires=_get_requirements(),
       include_package_data=True,
       entry_points={
           'console_scripts': [
               'ennstatuscli = ennstatus.cli:cli',

0 comments (0 inline, 0 general)