FVDE/ennstatus Changeset - 47d07b5cb8db · Chaos Computer Club Lëtzebuerg Projects

Changeset - 47d07b5cb8db

Parent rev.

Child rev.

[Not reviewed]

feature-onionpy

0 3 0

Dennis Fink - 9 years ago 2016-03-02 20:01:22
dennis.fink@c3l.lu

Added flags

3 files changed with 20 insertions and 0 deletions:

ennstatus/api/model.py

ennstatus/api/schema/server.json

ennstatus/api/views.py

0 comments (0 inline, 0 general)

ennstatus/api/model.py

➞

Show inline comments

@@ @@ -117,12 +117,13 @@ class Server: @@
         self.type = kwargs['type']
         self.status = kwargs.get('status')
         self.fingerprint = kwargs['fingerprint']
         self.last_updated = kwargs['last_updated']
         self.country = kwargs['country']
         self.bandwidth = kwargs.get('bandwidth')
         self.flags = kwargs.get('flags')
         if self.type == 'bridge':
             self.obfs = kwargs.get('obfs')
             self.fteproxy = kwargs.get('fteproxy')
             self.flashproxy = kwargs.get('flashproxy')
             self.meek = kwargs.get('meek')
@@ @@ -244,12 +245,21 @@ class Server: @@
             data.middle_probability
+        )
         self.mean_consensus_weight_fraction = calculate_weight(
             data.consensus_weight_fraction
+        )
     def update_flags(self):
         try:
             data = manager.query('details', lookup=self.fingerprint)
         except:
             raise NotImplementedError
         self.flags = data.relays[0].flags
     def check_status(self):
         now = datetime.utcnow()
         delta = now - self.last_updated
         if delta.seconds >= 3600:

ennstatus/api/schema/server.json

➞

Show inline comments

@@ @@ -97,12 +97,17 @@ @@
                 "null"
             ],
             "default": null
         },
         "type": {
             "type": "string"
         },
         "flags": {
             "type": "array",
             "items": { "type": "string" },
             "uniqueItems": true
+        }
     },
     "required": [
         "name",
         "status",
         "last_updated",

ennstatus/api/views.py

➞

Show inline comments

@@ @@ -118,12 +118,17 @@ def update(): @@
     try:
         server.update_weights()
     except NotImplementedError:
         pass
     try:
         server.update_flags()
     except NotImplementedError:
         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')

0 comments (0 inline, 0 general)