[X2Go-Commits] [python-x2go] 01/01: On Windows: Improve debugging when a new X-Server port has to be allocated.

git-admin at x2go.org git-admin at x2go.org
Mon Mar 31 12:57:38 CEST 2014


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

x2go pushed a commit to branch master
in repository python-x2go.

commit 6bdf7372e3720156cd1d0aed08b5a8e2a1666833
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 31 12:57:20 2014 +0200

    On Windows: Improve debugging when a new X-Server port has to be allocated.
---
 debian/changelog |    2 ++
 x2go/xserver.py  |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index abe25db..3daea6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low
     - Allow catching "connection refused" errors while talking to an X2Go
       Session Broker (X2GoBrokerConnectionException).
     - Support cookie based authentication against a http(s) session broker.
+    - On Windows: Improve debugging when a new X-Server port has to be
+      allocated.
   * debian/control:
     + Add dependencies: python-requests, python-simplejson.
   * python-x2go.spec:
diff --git a/x2go/xserver.py b/x2go/xserver.py
index 5cf05f8..7118836 100644
--- a/x2go/xserver.py
+++ b/x2go/xserver.py
@@ -219,8 +219,11 @@ class X2GoClientXConfig(inifiles.X2GoIniFile):
             # otherwise use a detection algorithm to find a free TCP/IP port
             else:
                 _xserver_port = _default_xserver_port +1
+                self.logger('Attempting to detect an unused TCP/IP port for our X-Server, starting with port %s' % _xserver_port, loglevel=log.loglevel_DEBUG)
                 while utils.detect_unused_port(preferred_port=_xserver_port) != _xserver_port:
-                        _xserver_port += 1
+                    _xserver_port += 1
+                    self.logger('TCP/IP port was in use, trying next port: %s' % _xserver_port, loglevel=log.loglevel_DEBUG)
+                self.logger('allocating TCP/IP port %s for our X-Server' % _xserver_port, loglevel=log.loglevel_DEBUG)
                 _detect_xserver_port = _xserver_port
 
             # if the port changed, let's write it to our configuration file

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git



More information about the x2go-commits mailing list