[tor-commits] [metrics-tasks/master] don't crash if you can't find a desc

[karsten at torproject.org]

commit 6da2e5b741a96eb543cf1adcf9eb64a1c2877ec2
Author: Sathyanarayanan Gunasekaran <gsathya.ceg at gmail.com>
Date:   Sat Nov 24 15:23:42 2012 +0530

    don't crash if you can't find a desc
---
 task-1854/pylinf.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/task-1854/pylinf.py b/task-1854/pylinf.py
index eba39ea..9d324d6 100644
--- a/task-1854/pylinf.py
+++ b/task-1854/pylinf.py
@@ -57,7 +57,9 @@ class Router:
             return ""
 
     def get_advertised_bw(self, hex_digest):
-        return descriptors[self.hex_digest.upper()]
+        try:
+            return descriptors[self.hex_digest.upper()]
+        except: return 0
 
 def parse_bw_weights(values):
     data = {}
@@ -193,7 +195,7 @@ def parse_args():
     parser.add_option("-a", "--as", dest="as_db", default="GeoIPASNum.dat",
                       help="Input AS GeoIP database")
     parser.add_option("-s", "--server_desc", dest="server_desc",
-                      default="data/relay-descriptors/server-descriptors/", help="Server descriptors directory")
+                      default=False, help="Server descriptors directory")
     parser.add_option("-o", "--output", dest="output", default="entropy.csv",
                       help="Output filename")
     parser.add_option("-c", "--consensus", dest="consensus", default="in/consensus",
@@ -216,7 +218,8 @@ if __name__ == "__main__":
     if options.pickled_data:
         with open('data.pkl', 'rb') as pkl_input:
             descriptors = pickle.load(pkl_input)
-    else:
+
+    if options.server_desc:
         # load all server descs into memeory
         for file_name in os.listdir(options.server_desc):
             server_desc_files.append(os.path.join(options.server_desc, file_name))