Fix a bug in userFilename that left us with a directory in ./~/. Add a facility for controller-readable log messages with --controller-log-format

git-svn-id: file:///home/or/svnrepo/updater/trunk@17367 55e972cd-5a19-0410-ae62-a4d7a52db4cd

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/thandy/util.py b/lib/thandy/util.py
index 6b75ece..1fbff81 100644
--- a/lib/thandy/util.py
+++ b/lib/thandy/util.py
@@ -1,5 +1,6 @@
 # Copyright 2008 The Tor Project, Inc.  See LICENSE for licensing information.
 
+import logging
 import os
 import sys
 import tempfile
@@ -53,6 +54,7 @@ def userFilename(name):
     except KeyError:
         base = "~/.thandy"
 
+    base = os.path.expanduser(base)
     result = os.path.normpath(os.path.join(base, name))
     ensureParentDir(result)
     return result
@@ -141,3 +143,10 @@ def getRegistryValue(keyname):
     finally:
         if settings is not None:
             settings.Close()
+
+_controlLog = logging.getLogger("thandy-ctrl")
+
+def logCtrl(key, **args):
+    """DOCDOC"""
+    _controlLog.log(logging.INFO, key, extra={'cmd_args':args})
+