[or-cvs] r22623: {arm} fix: most of arm wasn't realizing when tor was shut down (arm/trunk/interface)

[Damian Johnson]

Author: atagar
Date: 2010-07-09 16:16:31 +0000 (Fri, 09 Jul 2010)
New Revision: 22623

Modified:
   arm/trunk/interface/logPanel.py
Log:
fix: most of arm wasn't realizing when tor was shut down



Modified: arm/trunk/interface/logPanel.py
===================================================================
--- arm/trunk/interface/logPanel.py	2010-07-09 15:51:08 UTC (rev 22622)
+++ arm/trunk/interface/logPanel.py	2010-07-09 16:16:31 UTC (rev 22623)
@@ -7,7 +7,7 @@
 from curses.ascii import isprint
 from TorCtl import TorCtl
 
-from util import log, panel, sysTools, uiTools
+from util import log, panel, sysTools, torTools, uiTools
 
 PRE_POPULATE_LOG = True               # attempts to retrieve events from log file if available
 
@@ -273,6 +273,11 @@
       # TorCtl providing notice that control port is closed
       self.controlPortClosed = True
       log.log(log.NOTICE, "Tor control port closed")
+      
+      # Allows the Controller to notice that tor's shut down.
+      # TODO: should make the controller the torctl event listener rather than
+      # this log panel (it'll also make this less hacky)
+      torTools.getConn().isAlive()
     self.tor_ctl_event(level, msg)
   
   def flush(self): pass