[tor-commits] [flashproxy/master] Just let it crash if there's a problem loading the relays file.

infinity0 at torproject.org infinity0 at torproject.org
Mon Oct 28 14:47:40 UTC 2013


commit 664cc093c0ee51a5d6d0ff5d51de62a9e473fba2
Author: David Fifield <david at bamsoftware.com>
Date:   Fri Sep 20 22:21:44 2013 -0700

    Just let it crash if there's a problem loading the relays file.
---
 facilitator/facilitator |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/facilitator/facilitator b/facilitator/facilitator
index 55f4af0..abc0815 100755
--- a/facilitator/facilitator
+++ b/facilitator/facilitator
@@ -515,11 +515,7 @@ obfs2|websocket 1.4.6.1:4123\
 """
         sys.exit(1)
 
-    try:
-        handle_relay_file(options.relay_filename)
-    except ValueError as e:
-        print >> sys.stderr, u"Could not parse relay file %s: %s." % (repr(options.relay_filename), str(e))
-        sys.exit(1)
+    handle_relay_file(options.relay_filename)
 
     if not options.relays:
         print >> sys.stderr, u"Warning: no relays configured."





More information about the tor-commits mailing list