[Pkg-privacy-commits] [obfsproxy] 38/353: Merge branch 'master' of https://github.com/blanu/py-obfsproxy

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit 4b598271f5da2cca5bc5b5b56e7cdf38e9e09cea
Merge: 4f7cb09 6acaf22
Author: Brandon Wiley <brandon at blanu.net>
Date:   Mon Aug 27 17:42:03 2012 -0500

    Merge branch 'master' of https://github.com/blanu/py-obfsproxy
    
    Conflicts:
    	src/cli.py

 src/cli.py                                | 21 ++++++++++++---------
 src/obfsproxy/framework/managed/server.py | 17 +++++++++++++----
 src/obfsproxy/manager/clientManager.py    |  7 +++++--
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --cc src/cli.py
index 861a437,0ce903d..e3e003c
--- a/src/cli.py
+++ b/src/cli.py
@@@ -70,14 -70,21 +70,17 @@@ if __name__ == '__main__'
  
      logging.error('py-obfsproxy CLI loaded')
  
-     daemon = None
-     if args.managed:
-         if checkClientMode():
-             logging.error('client')
-             daemon = ManagedClient()
+     try:
+         daemon = None
+         if args.managed:
+             if checkClientMode():
+                 logging.error('client')
+                 daemon = ManagedClient()
+             else:
+                 logging.error('server')
+                 daemon = ManagedServer()
          else:
-             logging.error('server')
-             daemon = ManagedServer()
-     else:
-         logging.error('Unsupported mode. Only managed mode is available at the moment.'
 -            logging.error('Unsupported mode. Only managed mode is available at the moment.')
++            logging.error('Unsupported mode. Only managed mode is available at the moment.'
 +                      )
+     except:
+       logging.exception('Exception launching daemon')
 -
 -#        if dest:
 -#            daemon = ExternalClient()
 -#        else:
 -#            daemon = ExternalServer()
diff --cc src/obfsproxy/manager/clientManager.py
index 95b46f1,95b46f1..ec1400c
--- a/src/obfsproxy/manager/clientManager.py
+++ b/src/obfsproxy/manager/clientManager.py
@@@ -15,5 -15,5 +15,8 @@@ class ClientManager(Manager)
  
  
  if __name__ == '__main__':
--    manager = ClientManager()
--    manager.launch()
++    try:
++        manager = ClientManager()
++        manager.launch()
++    except Exception as e:
++      print('Exception: '+str(e))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git