Skip to content
This repository has been archived by the owner on Mar 2, 2022. It is now read-only.

Aggregate fixes #109

Merged
merged 3 commits into from
Mar 25, 2018
Merged

Aggregate fixes #109

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f3f358
skip routers we dont have descriptors for
aagbsn Mar 25, 2018
8084d08
import error
aagbsn Mar 25, 2018
f6e2931
pass fp by arg name
aagbsn Mar 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions bwscanner/aggregate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import json

from twisted.internet.defer import inlineCallbacks
from txtorcon.torcontrolprotocol import TorProtocolError
from stem.descriptor.server_descriptor import RelayDescriptor
from stem.descriptor.router_status_entry import RouterStatusEntryV3

Expand Down Expand Up @@ -65,8 +66,13 @@ def write_aggregate_data(tor, scan_dirs, file_name="aggregate_measurements"):
log.debug("Could not calculate a valid filtered bandwidth, skipping relay.")
continue

routerstatus_info = yield tor.protocol.get_info_raw('ns/id/' + relay_fp.lstrip("$"))
descriptor_info = yield tor.protocol.get_info_raw('desc/id/' + relay_fp.lstrip("$"))
try:
routerstatus_info = yield tor.protocol.get_info_raw('ns/id/' + relay_fp.lstrip("$"))
descriptor_info = yield tor.protocol.get_info_raw('desc/id/' + relay_fp.lstrip("$"))
except TorProtocolError:
log.info("Relay {fp} not found in consensus!", fp=relay_fp)
continue

relay_routerstatus = RouterStatusEntryV3(routerstatus_info)
relay_descriptor = RelayDescriptor(descriptor_info)

Expand Down