[tor-commits] [arm/release] fix: Proc resolution without a pid gave stacktrace

[atagar at torproject.org]

commit f72aa4616ea605ac22fe012513d856aaeedb819e
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Apr 27 08:52:54 2011 -0700

    fix: Proc resolution without a pid gave stacktrace
    
    When the connection resolver hadn't been configured with a pid and we queried
    connections by proc resolution there was an uncaught exception. This didn't
    crash arm - it just resulted in a stacktrace for a split second at startup.
    This was most easily reproed by running arm on Linux in blind mode, with a
    sleep command between panel creation and redrawing the screen to keep the stack
    trace visible for a bit.
---
 src/util/connections.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/util/connections.py b/src/util/connections.py
index f632306..c090893 100644
--- a/src/util/connections.py
+++ b/src/util/connections.py
@@ -486,7 +486,7 @@ class ConnectionResolver(threading.Thread):
         else: self._rateThresholdBroken = 0
         
         if isDefault: self._subsiquentFailures = 0
-      except IOError, exc:
+      except (ValueError, IOError), exc:
         # this logs in a couple of cases:
         # - special failures noted by getConnections (most cases are already
         # logged via sysTools)