[or-cvs] r23283: {arm} fix: had log merging by time backwards (in arm/trunk: . src/interface)

[Damian Johnson]

Author: atagar
Date: 2010-09-22 15:21:24 +0000 (Wed, 22 Sep 2010)
New Revision: 23283

Modified:
   arm/trunk/TODO
   arm/trunk/src/interface/logPanel.py
Log:
fix: had log merging by time backwards



Modified: arm/trunk/TODO
===================================================================
--- arm/trunk/TODO	2010-09-22 04:41:37 UTC (rev 23282)
+++ arm/trunk/TODO	2010-09-22 15:21:24 UTC (rev 23283)
@@ -13,7 +13,7 @@
         - log to file, allowing non-runlevel events to be saved (provide both
             a continuous option and snapshots taking into account the current
             filter)
-        - provide daily dividers (otherwise there's no indicator for the day)
+        - make the maximum line count for entries configurable
         - log cropping based on time (idea by voidzero)
         - drop duplicate or overly verbose messages (feature request by asn)
       [ ] conf panel
@@ -59,9 +59,6 @@
             - http://www.linuxjournal.com/article/5737
 
 - Bugs
-  * there seems to be an issue merging tor and arm events by timestamp for long
-      running instances (probably a bug with determing the day of prepopulated
-      events)
   * when in client mode and tor stops the header panel doesn't say so
   * util are assuming that tor is running under the default command name
       attempt to determine the command name at runtime (if the pid is available
@@ -119,7 +116,7 @@
         [notice] Opening Socks listener on 127.0.0.1:9050
         [notice] Opening Transparent pf/netfilter listener on 127.0.0.1:9040
         [notice] Opening DNS listener on 127.0.0.1:53
-      * rdns and whois lookups
+      * rdns and whois lookups (to find ISP, country, and jurisdiction, etc)
         To avoid disclosing connection data to third parties this needs to be
         an all-or-nothing operation (ie, needs to fetch information on all
         relays or none of them). Plan is something like:

Modified: arm/trunk/src/interface/logPanel.py
===================================================================
--- arm/trunk/src/interface/logPanel.py	2010-09-22 04:41:37 UTC (rev 23282)
+++ arm/trunk/src/interface/logPanel.py	2010-09-22 15:21:24 UTC (rev 23283)
@@ -423,7 +423,7 @@
           self.msgLog.append(torEventBacklog.pop(0))
         elif not torEventBacklog:
           self.msgLog.append(armEventBacklog.pop(0))
-        elif armEventBacklog[0].timestamp > torEventBacklog[0].timestamp:
+        elif armEventBacklog[0].timestamp < torEventBacklog[0].timestamp:
           self.msgLog.append(torEventBacklog.pop(0))
         else:
           self.msgLog.append(armEventBacklog.pop(0))