[tor-commits] [obfsproxy/master] Log pyptlib version on startup.

asn at torproject.org asn at torproject.org
Sat May 10 19:13:33 UTC 2014


commit ce1a9e68fd8c6da2221f388e0f09b4efc740c6b9
Author: John Giannelos <johngiannelos at gmail.com>
Date:   Sat May 10 03:33:38 2014 +0300

    Log pyptlib version on startup.
---
 obfsproxy/pyobfsproxy.py |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/obfsproxy/pyobfsproxy.py b/obfsproxy/pyobfsproxy.py
index ac07c65..b91ccc1 100755
--- a/obfsproxy/pyobfsproxy.py
+++ b/obfsproxy/pyobfsproxy.py
@@ -20,6 +20,10 @@ import obfsproxy.managed.server as managed_server
 import obfsproxy.managed.client as managed_client
 from obfsproxy import __version__
 
+try:
+    from pyptlib import __version__ as pyptlibversion
+except Exception:
+    pass
 from pyptlib.config import checkClientMode
 from pyptlib.client_config import parseProxyURI
 
@@ -153,6 +157,10 @@ def pyobfsproxy():
     consider_cli_args(args)
 
     log.warning('Obfsproxy (version: %s) starting up.' % (__version__))
+    try:
+        log.warning('Pyptlib version: %s' % pyptlibversion)
+    except Exception:
+        pass
 
     log.debug('argv: ' + str(sys.argv))
     log.debug('args: ' + str(args))





More information about the tor-commits mailing list