python-x2go.git - master (branch) updated: 0.1.1.1-12-g3fb1a45 - x2go-commits

28 Jun 2011

The branch, master has been updated
       via  3fb1a45de69efba836f725c5e8ae5ca128959127 (commit)
       via  a7e043c046bd4088bc991a79708b8544123ff45b (commit)
      from  9ab58903d0517d1633730fc2e1973eac8d7c2bea (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 -----------------------------------------------------------------
commit 3fb1a45de69efba836f725c5e8ae5ca128959127
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Jun 28 21:01:08 2011 +0200

    Fix for session status notification for sessions with PENDING terminal session.

commit a7e043c046bd4088bc991a79708b8544123ff45b
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Jun 28 20:59:52 2011 +0200

    Getting log msg more precise...

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 x2go/forward.py  |   11 ++++++-----
 x2go/session.py  |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index cb2524e..67214b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ python-x2go (0.1.1.2-0~x2go1) UNRELEASED; urgency=low
     - Add X2goSession method that detects if auto-connecting a session profile
       is probably possible.
     - Fix MIME box action SAVEAS.
+    - Fix for session status notification for sessions with PENDING terminal session.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 24 Jun 2011 16:42:20 +0200
 
diff --git a/x2go/forward.py b/x2go/forward.py
index f12666b..f87e964 100644
--- a/x2go/forward.py
+++ b/x2go/forward.py
@@ -113,11 +113,12 @@ class X2goFwServer(StreamServer):
                 chan_peername = self.chan.getpeername()
                 _success = True
             except Exception, e:
-                self.logger('incoming request to %s:%d failed on attempt %d: %s' % (self.chain_host,
-                                                                                    self.chain_port,
-                                                                                    _count,
-                                                                                    repr(e)),
-                                                                                    loglevel=log.loglevel_WARN)
+                self.logger('incoming request to %s:%d failed on attempt %d of %d: %s' % (self.chain_host,
+                                                                                          self.chain_port,
+                                                                                          _count,
+                                                                                          _maxwait,
+                                                                                          repr(e)),
+                                                                                          loglevel=log.loglevel_WARN)
                 gevent.sleep(.4)
 
 
diff --git a/x2go/session.py b/x2go/session.py
index ead7b93..e69f960 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -979,7 +979,7 @@ class X2goSession(object):
         @rtype: C{bool}
 
         """
-        self.terminal_session == 'PENDING'
+        self.terminal_session = 'PENDING'
         _new_session = False
         if self.session_name is None:
             self.session_name = session_name


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).

    