[tor-commits] [flashproxy/master] Enhance registration logging.

[dcf at torproject.org]

commit 60828b4232f631a05fc1ed87a2e2d13781038d6f
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Sep 24 00:57:22 2012 -0700

    Enhance registration logging.
---
 flashproxy-client |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/flashproxy-client b/flashproxy-client
index b4c32f5..5d29204 100755
--- a/flashproxy-client
+++ b/flashproxy-client
@@ -7,6 +7,7 @@ import cStringIO
 import getopt
 import httplib
 import os
+import os.path
 import re
 import select
 import socket
@@ -662,27 +663,31 @@ def register():
     register_condvar.release()
 
 def register_using_command(command):
+    basename = os.path.basename(command[0])
     try:
+        log(u"Running command: %s" % " ".join(command))
         p = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = p.communicate()
     except OSError, e:
-        log(u"Error running registration helper: %s" % str(e))
+        log(u"Error running %s: %s" % (basename, str(e)))
         return False
     for line in stdout.splitlines():
-        log(line)
+        log(u"%s: %s" % (basename, line))
     for line in stderr.splitlines():
-        log(line)
+        log(u"%s: %s" % (basename, line))
     if p.returncode != 0:
-        log("Registration helper ended with status %d." % p.returncode)
+        log("%s exited with status %d." % (basename, p.returncode))
         return False
     return True
 
 def register_one():
     spec = format_addr(options.register_addr)
-    log(u"Registering \"%s\"." % spec)
+    log(u"Trying to register \"%s\"." % spec)
     for command in options.register_commands:
         if register_using_command(command):
             break
+    else:
+        log(u"All registration commands failed.")
 
 def registration_thread_func():
     while True: