[tor-commits] [nyx/master] Potential stacktrace when shutting down

[atagar at torproject.org]

commit 829da61b9494941e27fae17bf9aa35239fa0ddff
Author: Damian Johnson <atagar at torproject.org>
Date:   Sun Jun 21 11:13:13 2015 -0700

    Potential stacktrace when shutting down
    
    Our connection panel was missing a default value, causing exceptions to
    possibly be uncaught...
    
      Traceback (most recent call last):
      File "/usr/lib/python2.7/threading.py", line 551, in __bootstrap_inner
        self.run()
      File "/home/atagar/Desktop/nyx/nyx/connections/conn_panel.py", line 352, in run
        self._update()
      File "/home/atagar/Desktop/nyx/nyx/connections/conn_panel.py", line 508, in _update
        for circ in tor_controller().get_circuits():
      File "/home/atagar/Desktop/nyx/stem/control.py", line 411, in wrapped
        return func(self, *args, **kwargs)
      File "/home/atagar/Desktop/nyx/stem/control.py", line 3050, in get_circuits
        response = self.get_info('circuit-status')
      File "/home/atagar/Desktop/nyx/stem/control.py", line 558, in msg
        self._socket.send(message)
      File "/home/atagar/Desktop/nyx/stem/socket.py", line 122, in send
        raise stem.SocketClosed()
---
 nyx/connections/conn_panel.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nyx/connections/conn_panel.py b/nyx/connections/conn_panel.py
index 46c4a7c..fe41507 100644
--- a/nyx/connections/conn_panel.py
+++ b/nyx/connections/conn_panel.py
@@ -505,7 +505,7 @@ class ConnectionPanel(panel.Panel, threading.Thread):
     new_connections = [(conn.local_address, conn.local_port, conn.remote_address, conn.remote_port) for conn in conn_resolver.get_value()]
     new_circuits = {}
 
-    for circ in tor_controller().get_circuits():
+    for circ in tor_controller().get_circuits([]):
       # Skips established single-hop circuits (these are for directory
       # fetches, not client circuits)