[X2Go-Commits] python-x2go.git - build-main (branch) updated: 0.4.0.4-3-ga0f8350

X2Go dev team git-admin at x2go.org
Thu Jul 18 22:37:26 CEST 2013


The branch, build-main has been updated
       via  a0f8350668c13bc6a7ac9f37535e4f5ae423de4d (commit)
      from  501a5bd5efc4f91ae8f5d27148cd587ba858b06b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog            |    1 +
 x2go/backends/proxy/base.py |    5 ++++-
 x2go/forward.py             |   10 ++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 76b4db6..8eae08b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ python-x2go (0.4.0.5-0~x2go1) UNRELEASED; urgency=low
     - Paramiko monkey patch: Hostnames with the default SSH_PORT are stored
       in hostname-only format to the known_hosts file. Fixes redundant requests
       for confirming the remote host's fingerprint if port 22 is used.
+    - Improve log message when setting up port forwarding tunnel.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 18 Jun 2013 20:29:14 +0200
 
diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py
index 3e9d11e..01b3855 100644
--- a/x2go/backends/proxy/base.py
+++ b/x2go/backends/proxy/base.py
@@ -183,7 +183,7 @@ class X2GoProxyBASE(threading.Thread):
             raise x2go_exceptions.X2GoControlSessionException('The control session has died unexpectedly.')
         local_graphics_port = utils.detect_unused_port(preferred_port=local_graphics_port)
 
-        self.fw_tunnel = forward.start_forward_tunnel(local_port=local_graphics_port, 
+        self.fw_tunnel = forward.start_forward_tunnel(local_port=local_graphics_port,
                                                       remote_port=self.session_info.graphics_port,
                                                       ssh_transport=self.ssh_transport,
                                                       session_instance=self.session_instance,
@@ -281,6 +281,9 @@ class X2GoProxyBASE(threading.Thread):
             _count = 0
             _maxwait = 40
             while (not self.fw_tunnel.is_active) and (not self.fw_tunnel.failed) and (_count < _maxwait):
+                print self.fw_tunnel.is_active
+                print self.fw_tunnel.failed
+                print _count
                 _count += 1
                 self.logger('waiting for port fw tunnel to come up: 0.5s x %s' % _count, loglevel=log.loglevel_DEBUG)
                 gevent.sleep(.5)
diff --git a/x2go/forward.py b/x2go/forward.py
index e9e776a..3f355d3 100644
--- a/x2go/forward.py
+++ b/x2go/forward.py
@@ -78,6 +78,7 @@ class X2GoFwServer(StreamServer):
         self.is_active = False
         self.failed = False
         self.keepalive = False
+        self.listener = listener
         self.chain_host = remote_host
         self.chain_port = remote_port
         self.ssh_transport = ssh_transport
@@ -86,7 +87,7 @@ class X2GoFwServer(StreamServer):
 
         self.fw_socket = None
 
-        StreamServer.__init__(self, listener, self.x2go_forward_tunnel_handle)
+        StreamServer.__init__(self, self.listener, self.x2go_forward_tunnel_handle)
 
     def x2go_forward_tunnel_handle(self, fw_socket, address):
         """\
@@ -142,8 +143,9 @@ class X2GoFwServer(StreamServer):
 
         else:
 
-            self.logger('connected!  Tunnel open %r -> %r -> %r' % (self.fw_socket.getpeername(),
-                        chan_peername, (self.chain_host, self.chain_port)),
+            self.logger('connected!  Tunnel open %r -> %r (on master connection %r -> %r)' % (
+                        self.listener, (self.chain_host, self.chain_port),
+                        self.fw_socket.getpeername(), chan_peername),
                         loglevel=log.loglevel_INFO)
 
             # once we are here, we can presume the tunnel to be active...
@@ -167,6 +169,7 @@ class X2GoFwServer(StreamServer):
                 self.close_socket()
             except socket.error:
                 pass
+                raise
 
             self.is_active = False
             self.logger('Tunnel closed from %r' % (chan_peername,),
@@ -262,7 +265,6 @@ def start_forward_tunnel(local_host='127.0.0.1', local_port=22022,
     except socket.error:
         fw_server.failed = True
         fw_server.is_active = False
-        pass
 
     return fw_server
 


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list