[or-cvs] r24061: {arm} Including python version in debug dumps. (in arm/trunk: . src)

[Damian Johnson]

Author: atagar
Date: 2011-01-11 16:43:31 +0000 (Tue, 11 Jan 2011)
New Revision: 24061

Modified:
   arm/trunk/TODO
   arm/trunk/src/starter.py
Log:
Including python version in debug dumps.



Modified: arm/trunk/TODO
===================================================================
--- arm/trunk/TODO	2011-01-11 16:36:45 UTC (rev 24060)
+++ arm/trunk/TODO	2011-01-11 16:43:31 UTC (rev 24061)
@@ -34,13 +34,12 @@
           local connection, ie:
           myInternal --> myExternal --> foreign
           idea and initial patch by Fabian Keil
-      * expand dump (--debug) information
-        - os and python versions
-        - arm and tor configs (scrubbing private attributes)
+        - give a warning if family relays don't name us
       * classify config options as useful (defaultly shown), standard, and
         deprecated (configured to be hidden by default)
       * check tor source for deprecated options like 'group' (are they
         ignored? idea is thanks to NightMonkey)
+      * elaborate on the password prompt (suggestion by weasel)
   * release prep
     * pylint --indent-string="  " --disable=C,R interface/foo.py | less
     * double check __init__.py and README for added or removed files
@@ -212,7 +211,8 @@
       something storing the descriptions
   * handle mutiple tor instances
     * screen style (dialog for switching between instances)
-    * extra window with whatever stats can be aggregated over all instances
+    * extra window with whatever stats can be aggregated over all instances,
+      or a config option to aggregate stats for bw, resource usage, etc
   * option to save the current settings to the config
     * provide warning at startup if the armrc doesn't exist, with instructions
       for generating it

Modified: arm/trunk/src/starter.py
===================================================================
--- arm/trunk/src/starter.py	2011-01-11 16:36:45 UTC (rev 24060)
+++ arm/trunk/src/starter.py	2011-01-11 16:43:31 UTC (rev 24061)
@@ -276,9 +276,10 @@
       currentTime = time.localtime()
       timeLabel = time.strftime("%H:%M:%S %m/%d/%Y (%Z)", currentTime)
       initMsg = "Arm %s Debug Dump, %s" % (version.VERSION, timeLabel)
+      pythonVersionLabel = "Python Version: %s" % (".".join([str(arg) for arg in sys.version_info[:3]]))
       osLabel = "Platform: %s (%s)" % (platform.system(), " ".join(platform.dist()))
       
-      util.log.DUMP_FILE.write("%s\n%s\n%s\n" % (initMsg, osLabel, "-" * 80))
+      util.log.DUMP_FILE.write("%s\n%s\n%s\n%s\n" % (initMsg, pythonVersionLabel, osLabel, "-" * 80))
       util.log.DUMP_FILE.flush()
     except (OSError, IOError), exc:
       print "Unable to write to debug log file: %s" % util.sysTools.getFileErrorMsg(exc)